From 3ed3f86cf6b6fcb7b1ac6c215f585cd5a8227e9a Mon Sep 17 00:00:00 2001 From: ale5000 <15793015+ale5000-git@users.noreply.github.com> Date: Sat, 19 Oct 2024 22:06:25 +0200 Subject: [PATCH] Update scripts-testing.yml --- .github/workflows/scripts-testing.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/scripts-testing.yml b/.github/workflows/scripts-testing.yml index 734a3cb9..8712de44 100644 --- a/.github/workflows/scripts-testing.yml +++ b/.github/workflows/scripts-testing.yml @@ -64,9 +64,6 @@ jobs: if test "${current_os:?}" = 'Linux'; then prepare_shell 'bosh' 'tar.xz' 'http://fuz.su/pub/schilytools/bin/schily-2024-03-21-x86_64-linux-gcc.tar.xz' || exit "${?}" fi - if command 1> /dev/null -v 'sudo' && legacy_bb="$(command -v 'busybox')" && legacy_bb_dir="$(dirname "${legacy_bb:?}")"; then - sudo mv -f "${legacy_bb:?}" "${legacy_bb_dir:?}/busybox0" - fi - name: "Test scripts" shell: bash run: | @@ -81,7 +78,7 @@ jobs: } if test "${current_os:?}" = 'Linux'; then PATH="${PATH:-/usr/bin}:${workspace_dir:?}/cache/shells/extracted/bosh/opt/schily/bin" || exit "${?}"; fi if diff 1> /dev/null 2>&1 -- "$(command -v 'sh' || :)" "$(command -v 'bash' || :)"; then SH_IS_BASH='true'; fi - if command 1> /dev/null -v 'apt-get'; then sudo apt-get update; sudo apt-get -y -qq install 'mksh' 'yash' 'posh' 1> /dev/null; fi + if command 1> /dev/null -v 'apt-get'; then sudo apt-get -y -qq install 'mksh' 'yash' 'posh' 1> /dev/null; fi if command 1> /dev/null -v 'brew'; then brew 1> /dev/null install --quiet 'oils-for-unix' 'mksh' 'ksh93' 'yash'; fi if command 1> /dev/null -v 'choco'; then choco 1> /dev/null install 'busybox' -y --no-progress; fi # @@ -134,7 +131,7 @@ jobs: { local _shell _shell_cmd _status EXECUTED_LIST='' - for _shell in sh dash bash busybox busybox0 ash hush mksh ksh93 ksh zsh yash posh osh bosh pbosh obosh; do + for _shell in sh dash bash busybox ash hush mksh ksh93 ksh zsh yash posh osh bosh pbosh obosh; do if test "${_shell:?}" = 'ksh' && test -n "${ORIGINAL_KSH?}"; then _shell="${ORIGINAL_KSH:?}"; fi if ! _shell_cmd="$(command -v "${_shell:?}")" || skip "${1:?}" "${_shell:?}" || ! not_already_excuted "${_shell_cmd:?}"; then continue; fi printf 'SHELL: %s - SCRIPT: %s\n\n' "${_shell_cmd:?}" "${1:?}"