Skip to content

Commit 5680d1e

Browse files
committed
Fix premature exit.
1 parent 538b7da commit 5680d1e

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
FanConfig
2-
jls.cnfg
2+
jls.cfg

jls.tool

+13-13
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ elif [ -z "${jlType}" ]; then
359359
exit 1
360360
fi
361361

362-
# shellcheck source=./jls.cnfg
362+
# shellcheck source=./jls.cfg
363363
. "${configFile}"
364364

365365
# Do not run if the config file has not been edited.
@@ -376,9 +376,9 @@ fi
376376

377377

378378
function portS {
379-
sudo iocage pkg "${jlName}" install -y svnup || echo "Failed to install packages." >&2; exit 1
379+
sudo iocage pkg "${jlName}" install -y svnup || (echo "Failed to install packages." >&2; exit 1)
380380
sudo iocage exec -f "${jlName}" -- 'cat /usr/local/etc/svnup.conf.sample | sed -e "s:#host=svn\.:host=svn\.:" > /usr/local/etc/svnup.conf'
381-
sudo iocage exec -f "${jlName}" -- "svnup ports -v 0" || echo "Failed to install packages." >&2; exit 1
381+
sudo iocage exec -f "${jlName}" -- "svnup ports -v 0" || (echo "Failed to install packages." >&2; exit 1)
382382
sudo iocage exec -f "${jlName}" -- "cd /usr/ports/ports-mgmt/portmaster && make install clean"
383383
}
384384

@@ -450,7 +450,7 @@ if [ "${jlType}" = "plex" ]; then
450450
sudo iocage exec -f "${jlName}" -- 'ln -sf "/usr/local/plexdata/.bash_history" "/root/.bash_history"'
451451

452452
# Install packages
453-
sudo iocage pkg "${jlName}" install -y multimedia/plexmediaserver-plexpass tautulli ffmpeg yt-dlp py39-pycryptodomex AtomicParsley multimedia/libva-intel-driver multimedia/libva-intel-media-driver || echo "Failed to install packages." >&2; exit 1
453+
sudo iocage pkg "${jlName}" install -y multimedia/plexmediaserver-plexpass tautulli ffmpeg yt-dlp py39-pycryptodomex AtomicParsley multimedia/libva-intel-driver multimedia/libva-intel-media-driver || (echo "Failed to install packages." >&2; exit 1)
454454

455455
# Set permissions
456456
sudo iocage exec -f "${jlName}" -- "pw groupmod jailmedia -m plex"
@@ -592,8 +592,8 @@ elif [ "${jlType}" = "unifi" ]; then
592592
sudo iocage exec -f "${jlName}" -- 'ln -sf "/usr/local/share/java/unifi/.bash_history" "/root/.bash_history"'
593593

594594
# Install packages
595-
sudo iocage pkg "${jlName}" install -y openjdk17 mongodb44 || echo "Failed to install packages." >&2; exit 1
596-
sudo iocage pkg "${jlName}" install -y unifi8 || echo "Failed to install packages." >&2; exit 1
595+
sudo iocage pkg "${jlName}" install -y openjdk17 mongodb44 || (echo "Failed to install packages." >&2; exit 1)
596+
sudo iocage pkg "${jlName}" install -y unifi8 || (echo "Failed to install packages." >&2; exit 1)
597597

598598
sudo iocage pkg "${jlName}" lock -y openjdk17 mongodb44 unifi8
599599

@@ -642,7 +642,7 @@ elif [ "${jlType}" = "netdata" ]; then
642642
sudo iocage exec -f "${jlName}" -- "crontab /mnt/scripts/netdata/netdata.crontab"
643643

644644
# Install packages
645-
sudo iocage pkg "${jlName}" install -y netdata netdata-go smartmontools || echo "Failed to install packages." >&2; exit 1
645+
sudo iocage pkg "${jlName}" install -y netdata netdata-go smartmontools || (echo "Failed to install packages." >&2; exit 1)
646646

647647
# Enable Services
648648
sudo iocage exec -f "${jlName}" -- 'sysrc netdata_enable="YES"'
@@ -690,11 +690,11 @@ elif [ "${jlType}" = "pvr" ]; then
690690
sudo iocage exec -f "${jlName}" -- 'ln -sf "/usr/local/sonarr/.bash_history" "/root/.bash_history"'
691691

692692
# Install packages
693-
sudo iocage pkg "${jlName}" install -y sonarr jackett radarr bazarr mediainfo ca_root_nss || echo "Failed to install packages." >&2; exit 1
693+
sudo iocage pkg "${jlName}" install -y sonarr jackett radarr bazarr mediainfo ca_root_nss || (echo "Failed to install packages." >&2; exit 1)
694694
sudo iocage pkg "${jlName}" lock -y jackett
695695

696696
### mono fixes (see: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258709)
697-
sudo iocage pkg "${jlName}" install -y /mnt/scripts/pvr/mono6.8-6.8.0.123.txz /mnt/scripts/pvr/py37-pillow-7.0.0.txz /mnt/scripts/pvr/py37-olefile-0.46.txz || echo "Failed to install packages." >&2; exit 1
697+
sudo iocage pkg "${jlName}" install -y /mnt/scripts/pvr/mono6.8-6.8.0.123.txz /mnt/scripts/pvr/py37-pillow-7.0.0.txz /mnt/scripts/pvr/py37-olefile-0.46.txz || (echo "Failed to install packages." >&2; exit 1)
698698
sudo iocage pkg "${jlName}" lock -y mono6.8
699699
sudo iocage exec -f "${jlName}" -- 'cert-sync "/mnt/scripts/pvr/ca-root-nss.crt"'
700700
###
@@ -800,7 +800,7 @@ elif [ "${jlType}" = "gitea" ]; then
800800
sudo iocage exec -f "${jlName}" -- 'ln -sf "/usr/local/etc/gitea/.bash_history" "/root/.bash_history"'
801801

802802
# Install packages
803-
sudo iocage pkg "${jlName}" install -y gitea git ca_root_nss openssl gnupg || echo "Failed to install packages." >&2; exit 1
803+
sudo iocage pkg "${jlName}" install -y gitea git ca_root_nss openssl gnupg || (echo "Failed to install packages." >&2; exit 1)
804804
sudo iocage pkg "${jlName}" lock -y gitea
805805

806806
### Setup gitea
@@ -856,8 +856,8 @@ elif [ "${jlType}" = "search" ]; then
856856
sudo iocage exec -f "${jlName}" -- 'ln -sf "/usr/local/etc/elasticsearch/.bash_history" "/root/.bash_history"'
857857

858858
# Install packages
859-
sudo iocage pkg "${jlName}" install -y elasticsearch7 kibana7 tesseract-data tesseract || echo "Failed to install packages." >&2; exit 1
860-
sudo iocage pkg "${jlName}" install -y openjdk17 || echo "Failed to install packages." >&2; exit 1
859+
sudo iocage pkg "${jlName}" install -y elasticsearch7 kibana7 tesseract-data tesseract || (echo "Failed to install packages." >&2; exit 1)
860+
sudo iocage pkg "${jlName}" install -y openjdk17 || (echo "Failed to install packages." >&2; exit 1)
861861

862862
### Setup fscrawler
863863

@@ -910,7 +910,7 @@ elif [ "${jlType}" = "test" ]; then
910910
jl_init
911911

912912
# Install packages
913-
sudo iocage pkg "${jlName}" install -y phoronix-test-suite-php74 autoconf automake cmake gmake openjdk8 perl5 pkgconf python python3 || echo "Failed to install packages." >&2; exit 1
913+
sudo iocage pkg "${jlName}" install -y phoronix-test-suite-php74 autoconf automake cmake gmake openjdk8 perl5 pkgconf python python3 || (echo "Failed to install packages." >&2; exit 1)
914914

915915
# Check MAC Address
916916
sudo iocage get vnet0_mac "${jlName}"

0 commit comments

Comments
 (0)