From 92fabd1942fb24fbfcd2f37085af335c04500071 Mon Sep 17 00:00:00 2001 From: Bruvv Date: Mon, 27 Dec 2021 14:08:34 +0100 Subject: [PATCH] sync --- lidarr/rootfs/etc/cont-init.d/20-folders.sh | 13 ------------ radarr/rootfs/etc/cont-init.d/00-ha-env.sh | 2 +- .../rootfs/etc/cont-init.d/92-local_mounts.sh | 10 +++++----- .../rootfs/etc/cont-init.d/92-smb_mounts.sh | 20 +++++++++---------- whoogle/rootfs/scripts/90-config_yaml.sh | 4 ++-- 5 files changed, 18 insertions(+), 31 deletions(-) diff --git a/lidarr/rootfs/etc/cont-init.d/20-folders.sh b/lidarr/rootfs/etc/cont-init.d/20-folders.sh index 46557afcd..c79dc4c13 100644 --- a/lidarr/rootfs/etc/cont-init.d/20-folders.sh +++ b/lidarr/rootfs/etc/cont-init.d/20-folders.sh @@ -11,16 +11,3 @@ if [ ! -d /share/downloads ]; then mkdir -p /share/downloads chown -R abc:abc /share/downloads fi - -if [ -d /config/lidarr ]; then - echo "Moving to new location /config/addons_config/lidarr" - mkdir -p /config/addons_config/lidarr - chown -R abc:abc /config/addons_config/lidarr - mv /config/lidarr/* /config/addons_config/lidarr/ -fi - -if [ ! -d /config/addons_config/lidarr ]; then - echo "Creating /config/addons_config/lidarr" - mkdir -p /config/addons_config/lidarr - chown -R abc:abc /config/addons_config/lidarr -fi \ No newline at end of file diff --git a/radarr/rootfs/etc/cont-init.d/00-ha-env.sh b/radarr/rootfs/etc/cont-init.d/00-ha-env.sh index d0b511f60..d48e84bd4 100644 --- a/radarr/rootfs/etc/cont-init.d/00-ha-env.sh +++ b/radarr/rootfs/etc/cont-init.d/00-ha-env.sh @@ -1,5 +1,5 @@ #!/usr/bin/with-contenv bashio for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do - printf "$(bashio::config $k)" >/var/run/s6/container_environment/$k + printf "$(bashio::config "$k")" >/var/run/s6/container_environment/"$k" done diff --git a/radarr/rootfs/etc/cont-init.d/92-local_mounts.sh b/radarr/rootfs/etc/cont-init.d/92-local_mounts.sh index 0920d68bd..920edcd60 100644 --- a/radarr/rootfs/etc/cont-init.d/92-local_mounts.sh +++ b/radarr/rootfs/etc/cont-init.d/92-local_mounts.sh @@ -17,15 +17,15 @@ if bashio::config.has_value 'localdisks'; then devpath=/dev # Mount as label - [ ${disk:0:2} != "sd" ] && devpath=/dev/disk/by-label + [ "${disk:0:2}" != "sd" ] && devpath=/dev/disk/by-label # Creates dir - mkdir -p /mnt/$disk - chown -R $(id -u):$(id -g) /mnt/$disk + mkdir -p /mnt/"$disk" + chown -R "$(id -u):$(id -g)" /mnt/"$disk" # Legacy mounting : mount to share if still exists (avoid breaking changes) - [ -d /share/$disk ] && mount $devpath/$disk /share/$disk || true + [ -d /share/"$disk" ] && mount $devpath/"$disk" /share/"$disk" || true # Mount - mount $devpath/$disk /mnt/$disk && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) + mount $devpath/"$disk" /mnt/"$disk" && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) done diff --git a/radarr/rootfs/etc/cont-init.d/92-smb_mounts.sh b/radarr/rootfs/etc/cont-init.d/92-smb_mounts.sh index 06410e554..1177e83ce 100644 --- a/radarr/rootfs/etc/cont-init.d/92-smb_mounts.sh +++ b/radarr/rootfs/etc/cont-init.d/92-smb_mounts.sh @@ -26,7 +26,7 @@ if bashio::config.has_value 'networkdisks'; then for disk in ${MOREDISKS//,/ }; do # Separate comma separated values # Clean name of network share - disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name + disk=$(echo "$disk" | sed "s,/$,,") # Remove / at end of name diskname=${disk//\\//} #replace \ with / diskname=${diskname##*/} # Get only last part of the name @@ -37,18 +37,18 @@ if bashio::config.has_value 'networkdisks'; then fi # Prepare mount point - mkdir -p /mnt/$diskname - chown -R root:root /mnt/$diskname + mkdir -p /mnt/"$diskname" + chown -R root:root /mnt/"$diskname" #Tries to mount with default options - mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false + mount -t cifs -o rw,username="$CIFS_USERNAME",password="${CIFS_PASSWORD}""$DOMAIN" "$disk" /mnt/"$diskname" 2>ERRORCODE && MOUNTED=true || MOUNTED=false # if Fail test different smb and sec versions if [ $MOUNTED = false ]; then for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do - mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false + mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username="$CIFS_USERNAME",password="${CIFS_PASSWORD}"$SMBVERS $disk /mnt/"$diskname" 2>/dev/null && MOUNTED=true && break || MOUNTED=false for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do - mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false + mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username="$CIFS_USERNAME",password="${CIFS_PASSWORD}"$SMBVERS$SECVERS "$disk" /mnt/"$disk" name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false done done fi @@ -56,7 +56,7 @@ if bashio::config.has_value 'networkdisks'; then # Messages if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then #Test write permissions - touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && + touch /mnt/"$diskname"/testaze && rm /mnt/"$diskname"/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw" @@ -68,15 +68,15 @@ if bashio::config.has_value 'networkdisks'; then # Provide debugging info smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client #smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true - smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true + smbclient -L "$disk" -U "$CIFS_USERNAME"%"$CIFS_PASSWORD" || true # Error code bashio::log.fatal "Error read : $(/dev/null || true - rmdir /mnt/$diskname || true + umount /mnt/"$diskname" 2>/dev/null || true + rmdir /mnt/"$diskname" || true fi done diff --git a/whoogle/rootfs/scripts/90-config_yaml.sh b/whoogle/rootfs/scripts/90-config_yaml.sh index 148482a8f..283595d65 100644 --- a/whoogle/rootfs/scripts/90-config_yaml.sh +++ b/whoogle/rootfs/scripts/90-config_yaml.sh @@ -73,7 +73,7 @@ while IFS= read -r line; do secret=${line#*secret } # Check if single match secretnum=$(sed -n "/$secret:/=" /config/secrets.yaml) - [[ $(echo $secretnum) == *' '* ]] && bashio::exit.nok "There are multiple matches for your password name. Please check your secrets.yaml file" + [[ $(echo "$secretnum") == *' '* ]] && bashio::exit.nok "There are multiple matches for your password name. Please check your secrets.yaml file" # Get text secret=$(sed -n "/$secret:/p" /config/secrets.yaml) secret=${secret#*: } @@ -81,7 +81,7 @@ while IFS= read -r line; do fi # Data validation if [[ $line =~ ^.+[=].+$ ]]; then - export "$line" + export "{$line}" # Export the variable sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || true sed -i "1a export $line" /scripts/*run* 2>/dev/null || true