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

Debug webroot user

Browse Source
This commit is contained in:
Bryan Roessler
2026-04-13 22:13:06 -04:00
parent 05c5a5299e
commit 7c4c36626f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
installJRMC
View File

@@ -260,7 +260,7 @@ init() {
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 WEBROOT_USER="$USER" # can be root declare -g WEBROOT_USER # can be root
declare -g SIGN_USER declare -g SIGN_USER
declare -g ID VERSION_ID UBUNTU_CODENAME VERSION_CODENAME ARCH MC_ARCH NAME declare -g ID VERSION_ID UBUNTU_CODENAME VERSION_CODENAME ARCH MC_ARCH NAME
declare -g MC_MVERSION MC_RELEASE MC_PKG MC_RPM MC_ROOT declare -g MC_MVERSION MC_RELEASE MC_PKG MC_RPM MC_ROOT
@@ -279,7 +279,8 @@ init() {
USER="${SUDO_USER:-$USER}" USER="${SUDO_USER:-$USER}"
fi fi
# Default signing context to the account currently running installJRMC. # Default webroot/signing contexts to the account currently running installJRMC.
WEBROOT_USER="${WEBROOT_USER:-$USER}"
SIGN_USER="${SIGN_USER:-$(id -un)}" SIGN_USER="${SIGN_USER:-$(id -un)}"
# Run the self-updater if enabled # Run the self-updater if enabled
@@ -1615,7 +1616,7 @@ service_jriver-x11vnc() {
service_jriver-createrepo() { service_jriver-createrepo() {
debug "${FUNCNAME[0]}()" debug "${FUNCNAME[0]}()"
local -a sign_args local -a sign_args
local service_script local service_script start_cmd
if [[ $WEBROOT_USER != "$USER" ]]; then if [[ $WEBROOT_USER != "$USER" ]]; then
USER="root" set_service_vars "${FUNCNAME[0]##*_}" "system" USER="root" set_service_vars "${FUNCNAME[0]##*_}" "system"
@@ -1641,6 +1642,9 @@ service_jriver-createrepo() {
[[ -n $SIGN_USER ]] && sign_args+=(--sign-user="$SIGN_USER") [[ -n $SIGN_USER ]] && sign_args+=(--sign-user="$SIGN_USER")
[[ -n $SIGN_KEY ]] && sign_args+=(--sign-key="$SIGN_KEY") [[ -n $SIGN_KEY ]] && sign_args+=(--sign-key="$SIGN_KEY")
debug "ExecStart=$service_script --outputdir=$OUTPUT_DIR --createrepo=$CREATEREPO_TARGET \
--createrepo-webroot=$CREATEREPO_WEBROOT --webroot-user=$WEBROOT_USER --mcrepo=$MC_REPO ${sign_args[*]} --yes --no-update"
sudo bash -c "cat <<-EOF > $SERVICE_FNAME sudo bash -c "cat <<-EOF > $SERVICE_FNAME
[Unit] [Unit]
Description=Builds JRiver Media Center RPM, moves it to the repo dir, and runs createrepo Description=Builds JRiver Media Center RPM, moves it to the repo dir, and runs createrepo