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

Allow more safe whitespace

Browse Source
This commit is contained in:
Bryan Roessler
2023-03-21 11:13:39 -04:00
parent cc6e866557
commit 3ac000e49a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
installJRMC
View File

@@ -794,7 +794,7 @@ buildRPM() {
-bb -bb
"$OUTPUTDIR/SPECS/mediacenter.spec" "$OUTPUTDIR/SPECS/mediacenter.spec"
) )
if execute "${rpmbuild_cmd[*]}" && [[ -f "$MCRPM" ]] ; then if execute "${rpmbuild_cmd[@]}" && [[ -f "$MCRPM" ]] ; then
echo "Build successful. The RPM file is located at: $MCRPM" echo "Build successful. The RPM file is located at: $MCRPM"
else else
err "Build failed" err "Build failed"
@@ -988,10 +988,10 @@ runCreaterepo() {
# Run createrepo # Run createrepo
cr_cmd=(sudo -u "$CREATEREPO_USER" createrepo -q "$CREATEREPO_WEBROOT") cr_cmd=(sudo -u "$CREATEREPO_USER" createrepo -q "$CREATEREPO_WEBROOT")
[[ -d "$CREATEREPO_WEBROOT/repodata" ]] && cr_cmd+=(--update) [[ -d "$CREATEREPO_WEBROOT/repodata" ]] && cr_cmd+=(--update)
if ! execute "${cr_cmd[*]}"; then if ! execute "${cr_cmd[@]}"; then
cr_cmd=(sudo createrepo -q "$CREATEREPO_WEBROOT") cr_cmd=(sudo createrepo -q "$CREATEREPO_WEBROOT")
[[ -d "$CREATEREPO_WEBROOT/repodata" ]] && cr_cmd+=(--update) [[ -d "$CREATEREPO_WEBROOT/repodata" ]] && cr_cmd+=(--update)
if ! (execute "${cr_cmd[*]}" && if ! (execute "${cr_cmd[@]}" &&
execute "sudo chown -R $CREATEREPO_USER:$CREATEREPO_USER $CREATEREPO_WEBROOT"); then execute "sudo chown -R $CREATEREPO_USER:$CREATEREPO_USER $CREATEREPO_WEBROOT"); then
err "createrepo failed" err "createrepo failed"
return 1 return 1
@@ -1059,7 +1059,7 @@ restoreLicense() {
for f in "$RESTOREFILE" "$newest"; do for f in "$RESTOREFILE" "$newest"; do
if [[ -f "$f" ]]; then if [[ -f "$f" ]]; then
if "mediacenter$MVERSION" "/RestoreFromFile" "$f"; then if execute "mediacenter$MVERSION" "/RestoreFromFile" "$f"; then
return 0 return 0
fi fi
fi fi