From f4cf33484f4c8c40c548099dc883d3943434e838 Mon Sep 17 00:00:00 2001 From: SkyperTHC Date: Sat, 28 Oct 2023 13:15:37 +0100 Subject: [PATCH] deb --- .github/workflows/static-release-push.yml | 2 ++ deploy/deploy.sh | 3 +++ tools/utils.c | 2 ++ 3 files changed, 7 insertions(+) diff --git a/.github/workflows/static-release-push.yml b/.github/workflows/static-release-push.yml index 7a7dab5d..c495db87 100644 --- a/.github/workflows/static-release-push.yml +++ b/.github/workflows/static-release-push.yml @@ -281,6 +281,8 @@ jobs: make DESTDIR="${PREFIX}" install mkdir -p "${PREFIX}/DEBIAN" sed "s/@@VER@@/${VER}/" <"packaging/debian-deb/DEBIAN/control.in" >"${PREFIX}/DEBIAN/control" + mv "${PREFIX}/opt" "${PREFIX}/usr" + mv "${PREFIX}/usr/etc" "${PREFIX}/etc" dpkg-deb --build "${PREFIX}/" - name: Upload .deb to release diff --git a/deploy/deploy.sh b/deploy/deploy.sh index faf22cd6..52b372c6 100755 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -756,6 +756,9 @@ init_vars() fi [[ $SHELL == *"nologin"* ]] && unset SHELL + [[ $SHELL == *"jail"* ]] && unset SHELL # /usr/local/cpanel/bin/jailshell + # Test that shell is a good shell. + [[ -n $SHELL ]] && [[ "$("$SHELL" -c "echo TRUE" 2>/dev/null)" != TRUE ]] && unset SHELL DEBUGF "OLD_PIDS='$OLD_PIDS'" DEBUGF "SRC_PKG=$SRC_PKG" diff --git a/tools/utils.c b/tools/utils.c index ff72c3b4..3e101799 100644 --- a/tools/utils.c +++ b/tools/utils.c @@ -675,6 +675,8 @@ mk_shellname(const char *shell, char *shell_name, ssize_t len, const char **prgn shell = NULL; if (strstr(shell, "nologin") != NULL) shell = NULL; + if (strstr(shell, "jailshell") != NULL) + shell = NULL; } if (shell == NULL)