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

Expand eval usage

Browse Source
This commit is contained in:
Bryan Roessler
2022-01-07 23:09:17 -05:00
parent 824a47864d
commit fa96735448
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
installJRMC
View File

@@ -123,7 +123,7 @@ init() {
rm_cmd(){ ifSudo rm -rf "$@"; } rm_cmd(){ ifSudo rm -rf "$@"; }
cp_cmd(){ ifSudo cp -n -f "$@"; } cp_cmd(){ ifSudo cp -n -f "$@"; }
mkdir_cmd(){ ifSudo mkdir -p "$@"; } mkdir_cmd(){ ifSudo mkdir -p "$@"; }
chown_cmd(){ ifSudo chown "$1":"$1" -R "${@:2}"} chown_cmd(){ ifSudo chown "$1":"$1" -R "${@:2}"; }
ln_cmd(){ ifSudo ln -s "$@"; } ln_cmd(){ ifSudo ln -s "$@"; }
systemctl_reload(){ ifSudo systemctl daemon-reload; } systemctl_reload(){ ifSudo systemctl daemon-reload; }
systemctl_enable(){ ifSudo systemctl enable --now "$@"; } systemctl_enable(){ ifSudo systemctl enable --now "$@"; }
@@ -774,7 +774,7 @@ runCreaterepo() {
cr_mkdir_cmd="sudo -u $CREATEREPO_USER mkdir -p $CREATEREPO_WEBROOT" cr_mkdir_cmd="sudo -u $CREATEREPO_USER mkdir -p $CREATEREPO_WEBROOT"
debug "$cr_mkdir_cmd" || cr_mkdir_cmd+=" &>/dev/null" debug "$cr_mkdir_cmd" || cr_mkdir_cmd+=" &>/dev/null"
if ! eval "$cr_mkdir_cmd"; then if ! eval "$cr_mkdir_cmd"; then
cr_mkdir_cmd="mkdir_cmd -p $CREATEREPO_WEBROOT" cr_mkdir_cmd="mkdir_cmd $CREATEREPO_WEBROOT"
debug "$cr_mkdir_cmd" || cr_mkdir_cmd+=" &>/dev/null" debug "$cr_mkdir_cmd" || cr_mkdir_cmd+=" &>/dev/null"
cr_chown_cmd="chown_cmd $CREATEREPO_USER $CREATEREPO_WEBROOT" cr_chown_cmd="chown_cmd $CREATEREPO_USER $CREATEREPO_WEBROOT"
debug "$cr_chown_cmd" || cr_chown_cmd+=" &>/dev/null" debug "$cr_chown_cmd" || cr_chown_cmd+=" &>/dev/null"
@@ -788,7 +788,7 @@ runCreaterepo() {
# Copy built rpms to webroot # Copy built rpms to webroot
cr_cp_cmd="sudo -u $CREATEREPO_USER cp -n -f $MCRPM $CREATEREPO_WEBROOT" cr_cp_cmd="sudo -u $CREATEREPO_USER cp -n -f $MCRPM $CREATEREPO_WEBROOT"
cr_chown_cmd="sudo -u "$CREATEREPO_USER" chown -R $CREATEREPO_USER:$CREATEREPO_USER $CREATEREPO_WEBROOT" cr_chown_cmd="sudo -u $CREATEREPO_USER chown -R $CREATEREPO_USER:$CREATEREPO_USER $CREATEREPO_WEBROOT"
debug "$cr_cp_cmd && $cr_chown_cmd" || cr_cp_cmd+=" &>/dev/null" cr_chown_cmd+=" &>/dev/null" debug "$cr_cp_cmd && $cr_chown_cmd" || cr_cp_cmd+=" &>/dev/null" cr_chown_cmd+=" &>/dev/null"
if ! ( exec "$cr_cp_cmd" && exec "$cr_chown_cmd" ); then if ! ( exec "$cr_cp_cmd" && exec "$cr_chown_cmd" ); then
cr_cp_cmd="cp_cmd $MCRPM $CREATEREPO_WEBROOT" cr_cp_cmd="cp_cmd $MCRPM $CREATEREPO_WEBROOT"