Merge branch 'master' into 'develop'

# Conflicts:
#   files/tmux.conf.ssh
This commit is contained in:
Bradley Richins
2020-10-25 20:32:05 +00:00
2 changed files with 2 additions and 3 deletions

View File

@@ -52,7 +52,6 @@ $> chmod 755 zp-install.run
$> ./zp-install.run $> ./zp-install.run
``` ```
- MakeSelf installer [GitHub Release](https://github.com/RaumXV/zpower/releases/download/v1.1/zp-install.run)
- MakeSelf installer [GitLab Release](https://gitlab.com/bradley.richins/zpower/-/raw/master/zp-install.run?inline=false) - MakeSelf installer [GitLab Release](https://gitlab.com/bradley.richins/zpower/-/raw/master/zp-install.run?inline=false)
_NOTE:_ When downloading this from gitlab the file name will most likely be changed from `zp-install.run` to `zp-install.txt`. As long as this file has exec prermissions it will work _NOTE:_ When downloading this from gitlab the file name will most likely be changed from `zp-install.run` to `zp-install.txt`. As long as this file has exec prermissions it will work
@@ -62,6 +61,6 @@ $> chmod 755 zp-install.txt
$> ./zp-install.txt $> ./zp-install.txt
``` ```
`zp-install.run` was generated with `$> makeself --sha256 ./zpower zp-install.run "ZPower Shell Pack Installer" ./install.sh` `zp-install.run` was generated with `$> makeself --sha256 ./ ./zpower zp-install.run "ZPower Shell Pack Installer" ./install.sh`
MakeSelf: A self-extracting archiving tool for Unix systems, in 100% shell script - [GitHub](https://github.com/megastep/makeself) / [Website](https://makeself.io/) MakeSelf: A self-extracting archiving tool for Unix systems, in 100% shell script - [GitHub](https://github.com/megastep/makeself) / [Website](https://makeself.io/)

View File

@@ -294,7 +294,7 @@ bind C-a send-prefix
# move status line to top # move status line to top
#set -g status-position top #set -g status-position top
bind '\' split-window -h bind \ split-window -h
unbind '"' unbind '"'
bind -n M-Left select-pane -L bind -n M-Left select-pane -L
bind -n M-Right select-pane -R bind -n M-Right select-pane -R