audrius/ioBroker.docker
1
0
Fork 0
mirror of https://github.com/buanet/ioBroker.docker.git synced 2026-01-02 05:52:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "add error handling for user scripts"

Browse Source 
This reverts commit 760a36f72a.
This commit is contained in:
buanet
2023-10-11 00:18:38 +02:00
parent 760a36f72a
commit 10de4b1a55
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
debian12/scripts/iobroker_startup.sh
View File

@@ -133,7 +133,11 @@ if [[ -f /opt/.docker_config/.first_run ]]; then
if [[ "$offlinemode" = "true" ]]; then
echo "OFFLINE_MODE is \"true\". Skipping Linux package updates on first run."
else
if ! bash /opt/scripts/setup_packages.sh -update; then echo "Failed."; fi
if bash /opt/scripts/setup_packages.sh -update; then
echo " "
else
echo "Error: Updating failed."
fi
fi
echo " "
# Installing packages from ENV
@@ -141,7 +145,11 @@ if [[ -f /opt/.docker_config/.first_run ]]; then
echo "PACKAGES is set, but OFFLINE_MODE is \"true\". Skipping Linux package installation."
elif [[ "$packages" != "" ]]; then
echo "PACKAGES is set. Installing the following additional Linux packages: ""$packages"
if ! bash /opt/scripts/setup_packages.sh -install; then echo "Failed."; fi
if bash /opt/scripts/setup_packages.sh -install; then
echo " "
else
echo "Error: Installation failed."
fi
fi
echo " "
# Register maintenance script
@@ -497,23 +505,17 @@ elif [[ -f /opt/userscripts/userscript_firststart.sh || -f /opt/userscripts/user
echo "Userscript for first start detected and this is the first start of a new container."
echo "Running userscript_firststart.sh... "
chmod 755 /opt/userscripts/userscript_firststart.sh
if ! bash /opt/userscripts/userscript_firststart.sh; then
echo "Failed."
else
echo "Done."
fi
bash /opt/userscripts/userscript_firststart.sh
echo "Done."
fi
if [[ -f /opt/userscripts/userscript_everystart.sh ]]; then
echo "Userscript for every start detected. Running userscript_everystart.sh... "
chmod 755 /opt/userscripts/userscript_everystart.sh
if ! bash /opt/userscripts/userscript_everystart.sh; then
echo "Failed."
else
echo "Done."
fi
bash /opt/userscripts/userscript_everystart.sh
echo "Done."
fi
echo " "
fi
echo " "
# Removing first run an fresh install markers when exists
if [[ -f /opt/.docker_config/.first_run ]]; then rm -f /opt/.docker_config/.first_run; fi