deb

hackerschoice · Oct 28, 2023 · f4cf334 · f4cf334
1 parent 5226f16
commit f4cf334
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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)