diff --git a/.templates/92-local_mounts.sh b/.templates/92-local_mounts.sh index 13e325e23..f6c4ee24f 100755 --- a/.templates/92-local_mounts.sh +++ b/.templates/92-local_mounts.sh @@ -25,45 +25,45 @@ if bashio::config.has_value 'localdisks'; then elif [ "${disk:0:2}" != "sd" ] && [ "${disk:0:4}" != "nvme" ] ; then devpath=/dev/disk/by-label fi - + # Creates dir mkdir -p /mnt/"$disk" chown "$PUID:$PGID" /mnt/"$disk" - + # Install lsblk - if ! command -v "lsblk" &>/dev/null; then + if ! command -v "lsblk" &>/dev/null; then if command -v "apk" &>/dev/null; then apk add --no-cache lsblk; fi if command -v "apt" &>/dev/null; then apt-get update && apt-get install -yqq util-linux; fi fi - - # Check FS type and set relative options (thanks @https://github.com/dianlight/hassio-addons) + + # Check FS type and set relative options (thanks @https://github.com/dianlight/hassio-addons) fstype=$(lsblk "$devpath"/"$disk" -no fstype) options="nosuid,relatime,noexec" type="auto" bashio::log.info "Mounting ${disk} of type ${fstype}" case "$fstype" in - exfat | vfat | msdos) - bashio::log.warning "${fstype} permissions and ACL don't works and this is an EXPERIMENTAL support" - options="${options},umask=000" - ;; - ntfs) - bashio::log.warning "${fstype} is an EXPERIMENTAL support" - options="${options},umask=000" - type="ntfs" - ;; - *) - if bashio::config.has_value 'PUID' && bashio::config.has_value 'PGID'; then - echo "Using PUID $(bashio::config 'PUID') and PGID $(bashio::config 'PGID')" - options="$options,uid=$(bashio::config 'PUID'),gid=$(bashio::config 'PGID')" - fi - ;; + exfat | vfat | msdos) + bashio::log.warning "${fstype} permissions and ACL don't works and this is an EXPERIMENTAL support" + options="${options},umask=000" + ;; + ntfs) + bashio::log.warning "${fstype} is an EXPERIMENTAL support" + options="${options},umask=000" + type="ntfs" + ;; + *) + if bashio::config.has_value 'PUID' && bashio::config.has_value 'PGID'; then + echo "Using PUID $(bashio::config 'PUID') and PGID $(bashio::config 'PGID')" + options="$options,uid=$(bashio::config 'PUID'),gid=$(bashio::config 'PGID')" + fi + ;; esac - - # Legacy mounting : mount to share if still exists (avoid breaking changes) + + # Legacy mounting : mount to share if still exists (avoid breaking changes) dirpath="/mnt" if [ -d /share/"$disk" ]; then dirpath="/share"; fi - + # shellcheck disable=SC2015 mount -t $type "$devpath"/"$disk" "$dirpath"/"$disk" -o $options && bashio::log.info "Success! $disk mounted to /mnt/$disk" || \ (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) diff --git a/transmission/rootfs/etc/cont-init.d/90-customUI.sh b/transmission/rootfs/etc/cont-init.d/90-customUI.sh index 34dffe1a2..365e76516 100755 --- a/transmission/rootfs/etc/cont-init.d/90-customUI.sh +++ b/transmission/rootfs/etc/cont-init.d/90-customUI.sh @@ -25,20 +25,20 @@ if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ] && [ ! "$C "transmission-web-control") mkdir -p /tmp/twctemp && \ - TWCVERSION=$(curl -s "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" | jq -r .tag_name) + TWCVERSION=$(curl -s "https://api.github.com/repos/ronggang/transmission-web-control/releases/latest" | jq -r .tag_name) curl -o /tmp/twc.tar.gz -L "https://github.com/ronggang/transmission-web-control/archive/${TWCVERSION}.tar.gz" tar xf /tmp/twc.tar.gz -C /tmp/twctemp --strip-components=1 mv /tmp/twctemp/src /transmission-web-control # Enables the original UI button in transmission-web-control ln -s /usr/share/transmission/web/style /transmission-web-control && \ - ln -s /usr/share/transmission/web/images /transmission-web-control && \ - ln -s /usr/share/transmission/web/javascript /transmission-web-control && \ - ln -s /usr/share/transmission/web/index.html /transmission-web-control/index.original.html + ln -s /usr/share/transmission/web/images /transmission-web-control && \ + ln -s /usr/share/transmission/web/javascript /transmission-web-control && \ + ln -s /usr/share/transmission/web/index.html /transmission-web-control/index.original.html ;; "kettu") mkdir -p /kettu && \ - curl -o /tmp/kettu.tar.gz -L "https://github.com/endor/kettu/archive/master.tar.gz" + curl -o /tmp/kettu.tar.gz -L "https://github.com/endor/kettu/archive/master.tar.gz" tar xf /tmp/kettu.tar.gz -C /kettu --strip-components=1 ;;