Skip to content

Commit

Permalink
Merge pull request #183 from greymd/feature/actions_v3
Browse files Browse the repository at this point in the history
actions/checkout@v2 -> v3
  • Loading branch information
greymd authored Apr 1, 2023
2 parents f002be0 + aac6834 commit d989bb1
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ on:
jobs:
shellcheck:
runs-on: ubuntu-latest
container: koalaman/shellcheck-alpine:v0.6.0
container: koalaman/shellcheck-alpine:v0.9.0
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Run shellcheck
run: shellcheck -s bash -f tty ./bin/xpanes ./*.sh

shfmt:
runs-on: ubuntu-latest
container: mvdan/shfmt:v3.1.0-alpine
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Run shfmt
run: shfmt -i 2 -ci -sr -kp -d ./bin/xpanes ./*.sh

Expand Down Expand Up @@ -581,7 +581,7 @@ jobs:
###END_INSERT###

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install dependency
run: |
apk add make curl gcc musl-dev libevent-dev ncurses-dev perl git util-linux bsd-compat-headers
Expand Down
2 changes: 2 additions & 0 deletions bin/xpanes
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ readonly XP_ENOCMD=127

# XP_THIS_FILE_NAME is supposed to be "xpanes".
readonly XP_THIS_FILE_NAME="${0##*/}"
# shellcheck disable=SC2155
readonly XP_THIS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
readonly XP_ABS_THIS_FILE_NAME="${XP_THIS_DIR}/${XP_THIS_FILE_NAME}"

Expand Down Expand Up @@ -1902,6 +1903,7 @@ xpns_parse_options() {

## Skip regularization if the arg is empty or --log= option
if [[ -n "$opt" ]] && [[ -n "${opt##--log=*}" ]]; then
# shellcheck disable=SC2295
## -ovalue → -o value
if [[ -z "${opt##-${XP_ARG_OPTIONS}?*}" ]]; then
set -- "${opt#??}" ${1+"$@"}
Expand Down
9 changes: 5 additions & 4 deletions install.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env bash
set -ue

# shellcheck disable=SC2155
readonly THIS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
readonly BINMODE=755
readonly DOCMODE=644
Expand All @@ -19,7 +20,7 @@ install -m "${BINMODE}" "${THIS_DIR}/bin/tmux-xpanes" "${PREFIX_BIN}/tmux-xpanes
# Install (man)
echo install -d "${PREFIX_MAN}"
install -d "${PREFIX_MAN}"
echo install -m "${BINMODE}" "${THIS_DIR}/man/xpanes.1" "${PREFIX_MAN}/xpanes.1"
install -m "${BINMODE}" "${THIS_DIR}/man/xpanes.1" "${PREFIX_MAN}/xpanes.1"
echo install -m "${BINMODE}" "${THIS_DIR}/man/tmux-xpanes.1" "${PREFIX_MAN}/tmux-xpanes.1"
install -m "${BINMODE}" "${THIS_DIR}/man/tmux-xpanes.1" "${PREFIX_MAN}/tmux-xpanes.1"
echo install -m "${DOCMODE}" "${THIS_DIR}/man/xpanes.1" "${PREFIX_MAN}/xpanes.1"
install -m "${DOCMODE}" "${THIS_DIR}/man/xpanes.1" "${PREFIX_MAN}/xpanes.1"
echo install -m "${DOCMODE}" "${THIS_DIR}/man/tmux-xpanes.1" "${PREFIX_MAN}/tmux-xpanes.1"
install -m "${DOCMODE}" "${THIS_DIR}/man/tmux-xpanes.1" "${PREFIX_MAN}/tmux-xpanes.1"
1 change: 0 additions & 1 deletion uninstall.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env bash
set -ue

readonly THIS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
readonly PREFIX="${1:-/usr/local}"
readonly PREFIX_BIN="${PREFIX}/bin"
readonly PREFIX_MAN="${PREFIX}/share/man/man1"
Expand Down

0 comments on commit d989bb1

Please sign in to comment.