avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-07-14 01:50:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Exits cleanly if validation of smb fails

Browse Source
This commit is contained in:
Alexandre
2021-10-24 17:34:15 +02:00
parent 8578ff1896
commit 14e1333617
20 changed files with 55 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
photoprism/rootfs/92-smb_mounts.sh
View File

@@ -13,10 +13,6 @@ if bashio::config.has_value 'networkdisks'; then
SMBVERS=""
SECVERS=""
# Dont execute if still default
[ ${MOREDISKS::1} == "<" ] &&
(bashio::log.warning 'The networkdisks option is set, but starts with the letter "<". IF you want to mount an SMB drive, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2' && exit 0)
# Mount CIFS Share if configured and if Protection Mode is active
bashio::log.info 'Mounting smb share(s)...'
@@ -36,7 +32,8 @@ if bashio::config.has_value 'networkdisks'; then
# Data validation
if [[ ! $disk =~ ^.*+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[/]+.*+$ ]]; then
bashio::log.fatal "The structure of your <networkdisks> doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2"
bashio::log.fatal "The structure of your \"networkdisks\" option : \"$disk\" doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2. If you don't use it, you can simply remove the text, this will avoid this error message in the future."
exit 0
fi
# Prepare mount point

6
photoprism/rootfs/run.sh
View File

@@ -47,7 +47,8 @@ fi
chown $(id -u):$(id -g) /92-local_mounts.sh
chmod a+x /92-local_mounts.sh
sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-local_mounts.sh
/./92-local_mounts.sh
/./92-local_mounts.sh &
true # Prevents script crash on failure
######################
# EXECUTE SMB SCRIPT #
@@ -55,7 +56,8 @@ sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-local_mounts.s
chown $(id -u):$(id -g) /92-smb_mounts.sh
chmod a+x /92-smb_mounts.sh
sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-smb_mounts.sh
/./92-smb_mounts.sh
/./92-smb_mounts.sh &
true # Prevents script crash on failure
##############
# LAUNCH APP #