Update nginx-proxy-manager-install.sh

setup/nginx-proxy-manager-install.sh

@@ -1,38 +1,30 @@
-#!/usr/bin/env bash
-
-set -o errexit 
-set -o errtrace 
-set -o nounset 
-set -o pipefail 
-shopt -s expand_aliases
-alias die='EXIT=$? LINE=$LINENO error_exit'
-trap die ERR
-trap 'die "Script interrupted."' INT
-
-function error_exit() {
-  trap - ERR
-  local DEFAULT='Unknown failure occured.'
-  local REASON="\e[97m${1:-$DEFAULT}\e[39m"
-  local FLAG="\e[91m[ERROR:LXC] \e[93m$EXIT@$LINE"
-  msg "$FLAG $REASON"
-  exit $EXIT
-}
-function msg() {
-  local TEXT="$1"
-  echo -e "$TEXT"
-}
-
+#!/usr/bin/env bash -ex
+set -euo pipefail
+shopt -s inherit_errexit nullglob
+YW=`echo "\033[33m"`
 RD=`echo "\033[01;31m"`
 BL=`echo "\033[36m"`
 GN=`echo "\033[1;92m"`
 CL=`echo "\033[m"`
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
 RETRY_NUM=10
 RETRY_EVERY=3
 NUM=$RETRY_NUM
+CM="${GN}✓${CL}"
+CROSS="${RD}✗${CL}"
+BFR="\\r\\033[K"
+HOLD="-"
+
+function msg_info() {
+    local msg="$1"
+    echo -ne " ${HOLD} ${YW}${msg}..."
+}
 
-echo -en "${GN} Setting up Container OS... "
+function msg_ok() {
+    local msg="$1"
+    echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
+}
+
+msg_info "Setting up Container OS "
 sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
 locale-gen >/dev/null
 while [ "$(hostname -I)" = "" ]; do
@@ -45,16 +37,15 @@ while [ "$(hostname -I)" = "" ]; do
     exit 1
   fi
 done
-echo -e "${CM}${CL} \r"
-echo -en "${GN} Network Connected: ${BL}$(hostname -I)${CL} "
-echo -e "${CM}${CL} \r"
+msg_ok "Set up Container OS"
+msg_ok "Network Connected: ${BL}$(hostname -I)"
 
-echo -en "${GN} Updating Container OS... "
+msg_info "Updating Container OS"
 apt update &>/dev/null
 apt-get -qqy upgrade &>/dev/null
-echo -e "${CM}${CL} \r"
+msg_ok "Updated Container OS"
 
-echo -en "${GN} Installing Dependencies... "
+msg_info "Installing Dependencies"
 apt-get update &>/dev/null
 apt-get -qqy install \
     sudo \
@@ -69,9 +60,9 @@ apt-get -qqy install \
     python3-dev \
     git \
     lsb-release &>/dev/null
-echo -e "${CM}${CL} \r"
+msg_ok "Installed Dependencies"
 
-  echo -en "${GN} Installing Python... "
+msg_info "Installing Dependencies"
   apt-get install -y -q --no-install-recommends python3 python3-pip python3-venv &>/dev/null
   pip3 install --upgrade setuptools &>/dev/null
   pip3 install --upgrade pip &>/dev/null
@@ -80,38 +71,38 @@ echo -e "${CM}${CL} \r"
     python3 -m pip install --no-cache-dir -U cryptography==3.3.2 &>/dev/null
   fi
   python3 -m pip install --no-cache-dir cffi certbot &>/dev/null
-echo -e "${CM}${CL} \r"
+msg_ok "Installed Dependencies"
 
-echo -en "${GN} Installing Openresty... "
+msg_info "Installing Openresty"
 wget -q -O - https://openresty.org/package/pubkey.gpg | apt-key add - &>/dev/null
 codename=`grep -Po 'VERSION="[0-9]+ \(\K[^)]+' /etc/os-release` &>/dev/null
 echo "deb http://openresty.org/package/debian $codename openresty" | tee /etc/apt/sources.list.d/openresty.list &>/dev/null
 apt-get -y update &>/dev/null
 apt-get -y install --no-install-recommends openresty &>/dev/null
-echo -e "${CM}${CL} \r"
+msg_ok "Installed Openresty"
 
-echo -en "${GN} Setting up Node.js Repository... "
+msg_info "Setting up Node.js Repository"
 sudo curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash - &>/dev/null
-echo -e "${CM}${CL} \r"
+msg_ok "Set up Node.js Repository"
 
-echo -en "${GN} Installing Node.js... "
+msg_info "Installing Node.js"
 sudo apt-get install -y nodejs git make g++ gcc &>/dev/null
- echo -e "${CM}${CL} \r"
+msg_ok "Installed Node.js"
  
-echo -en "${GN} Installing Yarn... "
+msg_info "Installing Yarn"
 npm install --global yarn &>/dev/null
-echo -e "${CM}${CL} \r"
+msg_ok "Installed Yarn"
 
 RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest \
 | grep "tag_name" \
 | awk '{print substr($2, 3, length($2)-4) }') \
 
-echo -en "${GN} Downloading NPM v${RELEASE}... "
+msg_info "Downloading Nginx Proxy Manager v${RELEASE}"
 wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v${RELEASE} -O - | tar -xz &>/dev/null
 cd ./nginx-proxy-manager-${RELEASE}
-echo -e "${CM}${CL} \r"
+msg_ok "Downloaded Nginx Proxy Manager v${RELEASE}"
 
-echo -en "${GN} Setting up Enviroment... "
+msg_info "Setting up Enviroment"
 ln -sf /usr/bin/python3 /usr/bin/python
 ln -sf /usr/bin/certbot /opt/certbot/bin/certbot
 ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx
@@ -155,7 +146,7 @@ chmod -R 777 /var/cache/nginx
 chown root /tmp/nginx
 
 echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" > /etc/nginx/conf.d/include/resolvers.conf
-echo -e "${CM}${CL} \r"
+
 if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ]; then
   echo -en "${GN} Generating dummy SSL Certificate... "
   openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -subj "/O=Nginx Proxy Manager/OU=Dummy Certificate/CN=localhost" -keyout /data/nginx/dummykey.pem -out /data/nginx/dummycert.pem &>/dev/null
@@ -164,18 +155,18 @@ fi
 mkdir -p /app/global /app/frontend/images
 cp -r backend/* /app
 cp -r global/* /app/global
-echo -e "${CM}${CL} \r"
+msg_ok "Set up Enviroment"
 
-echo -en "${GN} Building Frontend... "
+msg_info "Building Frontend"
 cd ./frontend
 export NODE_ENV=development
 yarn install --network-timeout=30000 &>/dev/null
 yarn build &>/dev/null
 cp -r dist/* /app/frontend
 cp -r app-images/* /app/frontend/images
-echo -e "${CM}${CL} \r"
+msg_ok "Built Frontend"
 
-echo -en "${GN} Initializing Backend... "
+msg_info "Initializing Backend"
 rm -rf /app/config/default.json &>/dev/null
 if [ ! -f /app/config/production.json ]; then
 cat << 'EOF' > /app/config/production.json
@@ -195,9 +186,9 @@ fi
 cd /app
 export NODE_ENV=development
 yarn install --network-timeout=30000 &>/dev/null
-echo -e "${CM}${CL} \r"
+msg_ok "Initialized Backend"
 
-echo -en "${GN} Creating NPM Service... "
+msg_info "Creating Service"
 cat << 'EOF' > /lib/systemd/system/npm.service
 [Unit]
 Description=Nginx Proxy Manager
@@ -215,11 +206,11 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 EOF
-echo -e "${CM}${CL} \r"
+msg_ok "Created Service"
 
 PASS=$(grep -w "root" /etc/shadow | cut -b6);
   if [[ $PASS != $ ]]; then
-echo -en "${GN} Customizing Container... "
+msg_info "Customizing Container"
 rm /etc/motd
 rm /etc/update-motd.d/10-uname
 touch ~/.hushlogin
@@ -232,17 +223,17 @@ ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,3840
 EOF
 systemctl daemon-reload
 systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
-echo -e "${CM}${CL} \r"
+msg_ok "Customized Container"
   fi
 
-echo -en "${GN} Starting Services... "
+msg_info "Starting Services"
 systemctl enable npm &>/dev/null
 systemctl start openresty
 systemctl start npm
-echo -e "${CM}${CL} \r"
+msg_ok "Started Services"
 
-echo -en "${GN} Cleanup... "
+msg_info "Cleaning up"
 apt-get autoremove >/dev/null
 apt-get autoclean >/dev/null
 rm -rf /var/{cache,log}/* /var/lib/apt/lists/*
-echo -e "${CM}${CL} \n"
+msg_ok "Cleaned"