bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Store piped script to intermediate file

Browse Source
This commit is contained in:
Bryan Roessler
2026-01-21 06:19:17 -05:00
parent d59ff67d59
commit eb1a4c76ba
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
installJRMC
View File

@@ -236,6 +236,17 @@ init() {
declare -g USER declare -g USER
declare -g SCRIPT_PATH; SCRIPT_PATH=$(readlink -f "${BASH_SOURCE[0]}") declare -g SCRIPT_PATH; SCRIPT_PATH=$(readlink -f "${BASH_SOURCE[0]}")
declare -g SCRIPT_DIR; SCRIPT_DIR=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")") declare -g SCRIPT_DIR; SCRIPT_DIR=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")
# If script is being piped, save it to a temp file for re-execution
if [[ ! -f $SCRIPT_PATH ]]; then
declare -g SCRIPT_TEMP
SCRIPT_TEMP=$(mktemp)
cat "${BASH_SOURCE[0]}" > "$SCRIPT_TEMP"
chmod +x "$SCRIPT_TEMP"
SCRIPT_PATH="$SCRIPT_TEMP"
SCRIPT_DIR=$(dirname "$SCRIPT_TEMP")
fi
declare -g OUTPUT_DIR="$SCRIPT_DIR/output" declare -g OUTPUT_DIR="$SCRIPT_DIR/output"
declare -g CREATEREPO_WEBROOT="/var/www/jriver" declare -g CREATEREPO_WEBROOT="/var/www/jriver"
declare -g CREATEREPO_USER="$USER" # can be root declare -g CREATEREPO_USER="$USER" # can be root
@@ -644,9 +655,7 @@ install_legacy_repo() {
Architectures: $MC_ARCH Architectures: $MC_ARCH
Signed-By: $repo_key Signed-By: $repo_key
EOF EOF
# Set a trap to always cleanup legacy repo declare -g LEGACY_REPO_FILE="$temp_repo_file"
# shellcheck disable=SC2064
trap "sudo rm -f $temp_repo_file" EXIT INT TERM
fi fi
} }
@@ -1837,6 +1846,7 @@ main() {
echo "Updating package lists" echo "Updating package lists"
if ! execute "${PKG_UPDATE[@]}"; then if ! execute "${PKG_UPDATE[@]}"; then
err "Package update failed!" err "Package update failed!"
[[ -n $LEGACY_REPO_FILE ]] && sudo rm -f "$LEGACY_REPO_FILE"
if [[ $MC_REPO != "$MC_REPO_HARDCODE" ]]; then if [[ $MC_REPO != "$MC_REPO_HARDCODE" ]]; then
echo "Rerunning installJRMC with --mcrepo=$MC_REPO_HARDCODE" echo "Rerunning installJRMC with --mcrepo=$MC_REPO_HARDCODE"
exec "$SCRIPT_PATH" "$@" "--no-update" "--mcrepo=$MC_REPO_HARDCODE" exec "$SCRIPT_PATH" "$@" "--no-update" "--mcrepo=$MC_REPO_HARDCODE"
@@ -1847,9 +1857,13 @@ main() {
echo "Installing $MC_PKG package" echo "Installing $MC_PKG package"
if ! install_package --no-install-check --no-gpg-check --allow-downgrades "$MC_PKG"; then if ! install_package --no-install-check --no-gpg-check --allow-downgrades "$MC_PKG"; then
err "MC package install failed!" err "MC package install failed!"
[[ -n $LEGACY_REPO_FILE ]] && sudo rm -f "$LEGACY_REPO_FILE"
return 1 return 1
fi fi
# Clean up legacy repo after successful install
[[ -n $LEGACY_REPO_FILE ]] && sudo rm -f "$LEGACY_REPO_FILE"
link_ssl_certs link_ssl_certs
restore_license restore_license
open_firewall "jriver-mediacenter" "52100-52200/tcp" "1900/udp" open_firewall "jriver-mediacenter" "52100-52200/tcp" "1900/udp"