Merge pull request #24 from bruvv:whoogle-fix

Beta
This commit is contained in:
bruvv
2022-01-03 09:42:31 +01:00
committed by GitHub
77 changed files with 122 additions and 103 deletions

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
line="${KEYS}=${VALUE//[\"\']/}"
# Use locally
if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
export line
export $line
# Export the variable to run scripts
line="${KEYS}=${VALUE//[\"\']/} &>/dev/null"
sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run*

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
if [ ! -d /share/storage/movies ]; then
echo "Creating /share/storage/movies"
@@ -6,6 +6,12 @@ if [ ! -d /share/storage/movies ]; then
chown -R abc:abc /share/storage/movies
fi
if [ ! -d /share/storage/tv ]; then
echo "Creating /share/storage/tv"
mkdir -p /share/storage/tv
chown -R abc:abc /share/storage/tv
fi
if [ ! -d /share/downloads ]; then
echo "Creating /share/downloads"
mkdir -p /share/downloads

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
if [ ! -d /emby ]; then
echo "Creating /emby"
@@ -24,10 +24,18 @@ if [ ! -d /share/emby ]; then
chown -R abc:abc /share/emby
fi
if [ ! -d /config/emby ]; then
echo "Creating /config/emby"
mkdir -p /config/emby
chown -R abc:abc /config/emby
if [ -d /config/emby ] && [ ! -d /config/addons_config/emby ]; then
echo "Moving to new location /config/addons_config/emby"
mkdir -p /config/addons_config/emby
chown -R abc:abc /config/addons_config/emby
mv /config/emby/* /config/addons_config/emby/
rm -r /config/emby
fi
if [ ! -d /config/addons_config/emby ]; then
echo "Creating /config/addons_config/emby"
mkdir -p /config/addons_config/emby
chown -R abc:abc /config/addons_config/emby
fi
# links

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
line="${KEYS}=${VALUE//[\"\']/}"
# Use locally
if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
export line
export $line
# Export the variable to run scripts
line="${KEYS}=${VALUE//[\"\']/} &>/dev/null"
sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run*

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -38,9 +38,9 @@ Options can be configured through two ways :
- Config.yaml
Configuration is done by customizing the config.yaml in the location defined in your addon options
Additional variables can be set as ENV variables by adding them in the config.yaml in the location defined in your addon options
The complete list of options can be seen here : https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/.env.example
The complete list of ENV variables can be seen here : https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/.env.example
## Installation

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
line="${KEYS}=${VALUE//[\"\']/}"
# Use locally
if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
export line
export $line
# Export the variable to run scripts
line="${KEYS}=${VALUE//[\"\']/} &>/dev/null"
sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run*

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
line="${KEYS}=${VALUE//[\"\']/}"
# Use locally
if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
export line
export $line
# Export the variable to run scripts
line="${KEYS}=${VALUE//[\"\']/} &>/dev/null"
sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run*

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
if [ ! -d /share/downloads ]; then
echo "Creating /share/downloads"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
if [ ! -d /jellyfin ]; then
echo "Creating /jellyfin"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
line="${KEYS}=${VALUE//[\"\']/}"
# Use locally
if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
export line
export $line
# Export the variable to run scripts
line="${KEYS}=${VALUE//[\"\']/} &>/dev/null"
sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run*

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ ! -f "/usr/bin/bashio" ]; then
echo "Bashio does not exist, executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,6 +1,6 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
if [ -d /config/prowlarr ]; then
if [ -d /config/prowlarr ] && [ ! -d /config/addons_config/prowlarr ]; then
echo "Moving to new location /config/addons_config/prowlarr"
mkdir -p /config/addons_config/prowlarr
chown -R abc:abc /config/addons_config/prowlarr

View File

@@ -8,6 +8,13 @@ profile db21ed7f_qbittorrent flags=(attach_disconnected,mediate_deleted) {
mount,
umount,
remount,
network udp,
network tcp,
network dgram,
network stream,
network inet,
network inet6,
network netlink raw,
capability setgid,
capability chown,

View File

@@ -102,6 +102,6 @@
"slug": "qbittorrent",
"upstream": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls159",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls160-2",
"version": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls160-3",
"webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
}

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
if [ ! -d /share/storage/movies ]; then
echo "Creating /share/storage/movies"
@@ -12,15 +12,15 @@ if [ ! -d /share/downloads ]; then
chown -R abc:abc /share/downloads
fi
if [ ! -d /config/addons_config/radarr ]; then
if [ -d /config/radarr ]; then
if [ -d /config/radarr ] && [ ! -d /config/addons_config/radarr ]; then
echo "Moving to new location /config/addons_config/radarr"
mkdir -p /config/addons_config/radarr
chown -R abc:abc /config/addons_config/radarr
mv /config/radarr/* /config/addons_config/radarr/
rm -r /config/radarr
fi
if [ ! -d /config/addons_config/radarr ]; then
echo "Creating /config/addons_config/radarr"
mkdir -p /config/addons_config/radarr
chown -R abc:abc /config/addons_config/radarr

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,9 +1,9 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
if [ ! -d /share/music ]; then
echo "Creating /share/music"
mkdir -p /share/music
chown -R abc:abc /share/music
if [ ! -d /share/storage/ebook ]; then
echo "Creating /share/storage/ebook"
mkdir -p /share/storage/ebook
chown -R abc:abc /share/storage/ebook
fi
if [ ! -d /share/downloads ]; then
@@ -12,15 +12,16 @@ if [ ! -d /share/downloads ]; then
chown -R abc:abc /share/downloads
fi
if [ ! -d /config/addons_config/readarr ]; then
if [ -d /config/readarr ]; then
if [ -d /config/readarr ] && [ ! -d /config/addons_config/readarr ]; then
echo "Moving to new location /config/addons_config/readarr"
mkdir -p /config/addons_config/readarr
chown -R abc:abc /config/addons_config/readarr
mv /config/readarr/* /config/addons_config/readarr/
rm -r /config/readarr
fi
echo "Creating /config/addons_config/readarr"
fi
if [ ! -d /config/addons_config/readarr ]; then
echo "Creating /config/addons_config/readarr"
mkdir -p /config/addons_config/readarr
chown -R abc:abc /config/addons_config/readarr
fi

View File

@@ -1,5 +1,5 @@
{
"name": "HA Add-ons by alexbelgium for testing ONLY!",
"url": "https://github.com/bruvv/hassio-addons-1",
"maintainer": "bruvv"
"name": "HA Add-ons by alexbelgium",
"url": "https://github.com/alexbelgium/hassio-addons",
"maintainer": "alexbelgium"
}

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -22,11 +22,8 @@ FROM ${BUILD_FROM}
##################
RUN \
# Install script
chmod a+x /run.sh \
\
# Allow UID and GID setting
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
# use /data instead of /config for database

View File

@@ -1,6 +1,6 @@
{
"name": "Scrutiny",
"version": "0.3.13-3",
"version": "0.3.13-4",
"upstream": "0.3.13",
"slug": "scrutiny",
"description": "Scrutiny WebUI for smartd S.M.A.R.T monitoring",

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,9 +1,9 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
if [ ! -d /share/storage/movies ]; then
echo "Creating /share/storage/movies"
mkdir -p /share/storage/movies
chown -R abc:abc /share/storage/movies
if [ ! -d /share/storage/tv ]; then
echo "Creating /share/storage/tv"
mkdir -p /share/storage/tv
chown -R abc:abc /share/storage/tv
fi
if [ ! -d /share/downloads ]; then
@@ -12,7 +12,7 @@ if [ ! -d /share/downloads ]; then
chown -R abc:abc /share/downloads
fi
if [ -d /config/sonarr ]; then
if [ -d /config/sonarr ] && [ ! -d /config/addons_config/sonarr ]; then
echo "Moving to new location /config/addons_config/sonarr"
mkdir -p /config/addons_config/sonarr
chown -R abc:abc /config/addons_config/sonarr

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
## 0.7.1
- Breaking change
- Changed the config handeling
- Added a docs with the config explaination.
- Make sure you redo your configuration!

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -16,7 +16,7 @@ for KEYS in "${arr[@]}"; do
line="${KEYS}=${VALUE//[\"\']/}"
# Use locally
if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi
export line
export $line
# Export the variable to run scripts
line="${KEYS}=${VALUE//[\"\']/} &>/dev/null"
sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || sed -i "1a export $line" /scripts/*run*

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# If dockerfile failed install manually
if [ -e "/ENVFILE" ]; then
echo "Executing script"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
# Color comments
#! Red

View File

@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio
#!/bin/bash
########
# INIT #