avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-05-26 02:31:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

improve

Browse Source
This commit is contained in:
Alexandre
2021-12-10 22:44:49 +01:00
parent 17a8e244ae
commit f9d3b33e5d
2 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
zzz_templates/00-aaa_dockerfile_backup.sh
View File

@@ -1,28 +1,18 @@
#!/bin/bash #!/bin/bash
# If dockerfile failed install manually # If dockerfile failed install manually
if [ ! -f "/usr/bin/bashio" ]; then if [ -e "/ENVFILE" ]; then
echo "Bashio does not exist, executing script" echo "Executing script"
PACKAGES=$(< /ENVFILE)
( (
################ #######################
# Install apps # # Automatic installer #
################ #######################
PACKAGES="${PACKAGES:="curl"}" $(ls /bin/bash &>/dev/null) || (apt-get install -y --no-install-recommends bash || apk add --no-cache bash) && \
$(curl --help &>/dev/null) || (apt-get install -y --no-install-recommends curl &>/dev/null || apk add --no-cache curl) && \
apt-get clean \ curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \
&& apt-get update \ chmod 777 /automatic_packages.sh && \
&& apt-get install -y --no-install-recommends ${PACKAGES} 2>/dev/null \ eval /./automatic_packages.sh "$PACKAGES" && \
|| apk add --no-cache ${PACKAGES} rm /automatic_packages.sh
###################
# Install bashio #
##################
mkdir -p /tmp/bashio
curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" |
tar -xzf - --strip 1 -C /tmp/bashio
mv /tmp/bashio/lib /usr/lib/bashio
ln -s /usr/lib/bashio/bashio /usr/bin/bashio
rm -rf /tmp/bashio
) >/dev/null ) >/dev/null

6
zzz_templates/automatic_packages.sh
View File

@@ -44,6 +44,7 @@ for files in "/etc/cont-init.d" "/etc/services.d" "/scripts"; do
# Next directory if does not exists # Next directory if does not exists
if ! ls $files 1> /dev/null 2>&1; then continue; fi if ! ls $files 1> /dev/null 2>&1; then continue; fi
# Test each possible command
COMMAND="nginx" COMMAND="nginx"
if grep -q -rnw "$files/" -e "$COMMAND" && ! command -v $COMMAND &> /dev/null; then if grep -q -rnw "$files/" -e "$COMMAND" && ! command -v $COMMAND &> /dev/null; then
[ "$VERBOSE" = true ] && echo "$COMMAND required" [ "$VERBOSE" = true ] && echo "$COMMAND required"
@@ -66,9 +67,8 @@ for files in "/etc/cont-init.d" "/etc/services.d" "/scripts"; do
[ "$PACKMANAGER" = "apt" ] && PACKAGES="$PACKAGES samba smbclient" [ "$PACKMANAGER" = "apt" ] && PACKAGES="$PACKAGES samba smbclient"
fi fi
COMMAND="openvpn" COMMAND="openvpn"
if grep -q -rn "$files/" -e "$COMMAND" && ! command -v $COMMAND &> /dev/null; then if grep -q -rnw "$files/" -e "$COMMAND" && ! command -v $COMMAND &> /dev/null; then
[ "$VERBOSE" = true ] && echo "$COMMAND required" [ "$VERBOSE" = true ] && echo "$COMMAND required"
[ "$PACKMANAGER" = "apk" ] && PACKAGES="$PACKAGES coreutils openvpn" [ "$PACKMANAGER" = "apk" ] && PACKAGES="$PACKAGES coreutils openvpn"
[ "$PACKMANAGER" = "apt" ] && PACKAGES="$PACKAGES coreutils openvpn" [ "$PACKMANAGER" = "apt" ] && PACKAGES="$PACKAGES coreutils openvpn"
@@ -149,7 +149,7 @@ fi
for files in "/scripts" "/etc/services.d" "/etc/cont-init.d"; do for files in "/scripts" "/etc/services.d" "/etc/cont-init.d"; do
# Next directory if does not exists # Next directory if does not exists
if ! ls $files 1> /dev/null 2>&1; then continue; fi if ! ls $files 1> /dev/null 2>&1; then continue; fi
# Bashio # Bashio
if grep -q -rnw "$files/" -e 'bashio' && [ ! -f "/usr/bin/bashio" ]; then if grep -q -rnw "$files/" -e 'bashio' && [ ! -f "/usr/bin/bashio" ]; then