mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-01-09 17:31:03 +01:00
lint
This commit is contained in:
@@ -85,7 +85,7 @@ echo "${CONFIG}" >"$CONFIGDIR"/settings.json &&
|
||||
# USER and PASS
|
||||
###############
|
||||
|
||||
CONFIG=$(<$CONFIGDIR/settings.json)
|
||||
CONFIG=$(<"$CONFIGDIR"/settings.json)
|
||||
USER=$(bashio::config 'user')
|
||||
PASS=$(bashio::config 'pass')
|
||||
if bashio::config.has_value 'user'; then
|
||||
@@ -98,7 +98,7 @@ fi
|
||||
CONFIG=$(bashio::jq "${CONFIG}" ".\"rpc-authentication-required\"=${BOOLEAN}")
|
||||
CONFIG=$(bashio::jq "${CONFIG}" ".\"rpc-username\"=\"${USER}\"")
|
||||
CONFIG=$(bashio::jq "${CONFIG}" ".\"rpc-password\"=\"${PASS}\"")
|
||||
echo "${CONFIG}" >$CONFIGDIR/settings.json &&
|
||||
echo "${CONFIG}" >"$CONFIGDIR"/settings.json &&
|
||||
jq . -S "$CONFIGDIR"/settings.json | cat >temp.json && mv temp.json "$CONFIGDIR"/settings.json
|
||||
|
||||
# WHITELIST
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
# INGRESS SETTING #
|
||||
###################
|
||||
declare port
|
||||
declare certfile
|
||||
declare ingress_interface
|
||||
declare ingress_port
|
||||
declare keyfile
|
||||
#declare certfile
|
||||
#declare ingress_interface
|
||||
#declare ingress_port
|
||||
#declare keyfile
|
||||
|
||||
# General values
|
||||
port=$(bashio::addon.ingress_port)
|
||||
if [ $port ] >1; then
|
||||
if [ "$port" ] >1; then
|
||||
# Adapt nginx
|
||||
sed -i "s|%%port%%|$port|g" /etc/nginx/servers/ingress.conf
|
||||
sed -i "s|%%interface%%|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ingress.conf
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
###############
|
||||
declare port
|
||||
declare certfile
|
||||
declare ingress_interface
|
||||
declare ingress_port
|
||||
#declare ingress_interface
|
||||
#declare ingress_port
|
||||
declare keyfile
|
||||
|
||||
# General values
|
||||
|
||||
@@ -8,5 +8,5 @@ FILES=$(jq ".filesPaths[0].pathString" /config/addons_config/ubooquity/preferenc
|
||||
COMICS=$(jq ".comicsPaths[0].pathString" /config/addons_config/ubooquity/preferences.json)
|
||||
BOOKS=$(jq ".booksPaths[0].pathString" /config/addons_config/ubooquity/preferences.json)
|
||||
|
||||
mkdir -p $FILES $COMICS $BOOKS /config/addons_config/ubooquity || true
|
||||
chown -R abc:abc $FILES $COMICS $BOOKS /config/addons_config/ubooquity || true
|
||||
mkdir -p "$FILES" "$COMICS" "$BOOKS" /config/addons_config/ubooquity || true
|
||||
chown -R abc:abc "$FILES" "$COMICS" "$BOOKS" /config/addons_config/ubooquity || true
|
||||
|
||||
@@ -11,7 +11,7 @@ if bashio::config.has_value 'theme'; then
|
||||
bashio::log.info "Alternate theme enabled : $CUSTOMUI. If webui don't work, disable this option"
|
||||
|
||||
### Download WebUI
|
||||
case $CUSTOMUI in
|
||||
case "$CUSTOMUI" in
|
||||
"comixology2")
|
||||
curl -s -S -J -L -o /data/release.zip https://github.com/scooterpsu/Comixology_Ubooquity_2/releases/download/v3.4/comixology2.zip >/dev/null &&
|
||||
unzip -o -q /data/release.zip -d /config/addons_config/ubooquity/themes/
|
||||
@@ -29,6 +29,6 @@ if bashio::config.has_value 'theme'; then
|
||||
rm /data/release.zip || true
|
||||
|
||||
### Set preference
|
||||
jq --arg variable $CUSTOMUI '.theme = $variable' /config/addons_config/ubooquity/preferences.json | sponge /config/addons_config/ubooquity/preferences.json
|
||||
jq --arg variable "$CUSTOMUI" '.theme = $variable' /config/addons_config/ubooquity/preferences.json | sponge /config/addons_config/ubooquity/preferences.json
|
||||
|
||||
fi
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#!/usr/bin/env bashio
|
||||
# shellcheck shell=bash
|
||||
# shellcheck disable=SC2155
|
||||
|
||||
####################
|
||||
# GLOBAL VARIABLES #
|
||||
@@ -71,7 +72,7 @@ if bashio::config.true 'ssl'; then
|
||||
#Send env variables
|
||||
export HTTPS=true
|
||||
export SSL=true
|
||||
BASE_URL=$BASE_URL:$(bashio::addon.port 443)
|
||||
BASE_URL="$BASE_URL":$(bashio::addon.port 443)
|
||||
export BASE_URL="${BASE_URL/http:/https:}"
|
||||
|
||||
#Communication
|
||||
@@ -86,34 +87,35 @@ bashio::log.info "Launching app, please wait"
|
||||
|
||||
# Change data location
|
||||
echo "... update data with image"
|
||||
OLD_WEBTREES_HOME=$WEBTREES_HOME
|
||||
OLD_WEBTREES_HOME="$WEBTREES_HOME"
|
||||
export WEBTREES_HOME="/share/webtrees"
|
||||
cp -rn /var/www/webtrees "$(dirname "$OLD_WEBTREES_HOME")" &>/dev/null || true
|
||||
mkdir -p $WEBTREES_HOME
|
||||
mkdir -p "$WEBTREES_HOME"
|
||||
|
||||
echo "... update permissions"
|
||||
chown -R www-data:www-data $OLD_WEBTREES_HOME
|
||||
chown -R www-data:www-data $WEBTREES_HOME
|
||||
chown -R www-data:www-data "$OLD_WEBTREES_HOME"
|
||||
chown -R www-data:www-data "$WEBTREES_HOME"
|
||||
|
||||
# Make links with share
|
||||
echo "... make links with data in /share"
|
||||
for VOL in "data" "modules_v4"; do
|
||||
mkdir -p $OLD_WEBTREES_HOME/$VOL
|
||||
cp -rn $OLD_WEBTREES_HOME/$VOL $WEBTREES_HOME || true
|
||||
rm -r $OLD_WEBTREES_HOME/$VOL || true
|
||||
mkdir -p "$OLD_WEBTREES_HOME"/"$VOL"
|
||||
cp -rn "$OLD_WEBTREES_HOME"/"$VOL" "$WEBTREES_HOME" || true
|
||||
# shellcheck disable=SC2115
|
||||
rm -r "$OLD_WEBTREES_HOME"/"$VOL" || true
|
||||
echo "... linking $VOL"
|
||||
ln -s $WEBTREES_HOME/$VOL $OLD_WEBTREES_HOME
|
||||
ln -s "$WEBTREES_HOME"/"$VOL" "$OLD_WEBTREES_HOME"
|
||||
done
|
||||
|
||||
chown -R www-data:www-data $WEBTREES_HOME
|
||||
chown -R www-data:www-data "$WEBTREES_HOME"
|
||||
|
||||
# Correct base url if needed
|
||||
echo "... align base url with latest addon value"
|
||||
if [ -f $WEBTREES_HOME/data/config.ini.php ]; then
|
||||
if [ -f "$WEBTREES_HOME"/data/config.ini.php ]; then
|
||||
echo "Aligning base_url addon config"
|
||||
LINE=$(sed -n '/base_url/=' $WEBTREES_HOME/data/config.ini.php)
|
||||
sed -i "$LINE a base_url=\"$BASE_URL\"" $WEBTREES_HOME/data/config.ini.php
|
||||
sed -i "$LINE d" $WEBTREES_HOME/data/config.ini.php
|
||||
LINE=$(sed -n '/base_url/=' "$WEBTREES_HOME"/data/config.ini.php)
|
||||
sed -i "$LINE a base_url=\"$BASE_URL\"" "$WEBTREES_HOME"/data/config.ini.php
|
||||
sed -i "$LINE d" "$WEBTREES_HOME"/data/config.ini.php
|
||||
fi || true
|
||||
|
||||
# Execute main script
|
||||
@@ -125,7 +127,7 @@ cd /
|
||||
# END INFO #
|
||||
############
|
||||
|
||||
DB_NAME=$(echo $DB_NAME | tr -d '"')
|
||||
DB_NAME=$(echo "$DB_NAME" | tr -d '"')
|
||||
|
||||
bashio::log.info "Data is stored in $WEBTREES_HOME"
|
||||
bashio::log.info "Webui can be accessed at : $BASE_URL"
|
||||
|
||||
Reference in New Issue
Block a user