From 3a7cf2ed94cce923158b2470f805e720f30a745f Mon Sep 17 00:00:00 2001
From: Elton Renda <elton.renda@gmail.com>
Date: Tue, 5 Dec 2023 12:24:14 +0200
Subject: [PATCH] fix: remove source from install script

---
 apps/nginx-proxy-manager/install.sh |  3 +++
 install.sh                          | 31 ++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/apps/nginx-proxy-manager/install.sh b/apps/nginx-proxy-manager/install.sh
index 8e5d828..2c0d93a 100644
--- a/apps/nginx-proxy-manager/install.sh
+++ b/apps/nginx-proxy-manager/install.sh
@@ -17,10 +17,13 @@ source <(wget --no-cache -qO- ${EPS_BASE_URL}/utils/${EPS_OS_DISTRO}.sh)
 
 pms_bootstrap
 pms_settraps
+
 if [ $EPS_CT_INSTALL = false ]; then
   pms_header
 fi
 
+pms_check_os
+
 EPS_OS_ARCH=$(os_arch)
 EPS_OS_CODENAME=$(os_codename)
 EPS_OS_VERSION=${EPS_OS_VERSION:-$(os_version)}
diff --git a/install.sh b/install.sh
index 67adc30..166eafe 100755
--- a/install.sh
+++ b/install.sh
@@ -2,8 +2,15 @@
 export EPS_BASE_URL=https://raw.githubusercontent.com/ej52/proxmox-scripts/main
 export EPS_CT_INSTALL=false
 
-export EPS_UTILS=$(wget --no-cache -qO- $EPS_BASE_URL/utils/common.sh)
-source <(echo -n "$EPS_UTILS")
+CLR_RD="\033[0;31m"
+CLR_RDB="\033[1;31m"
+CLR_CYB="\033[1;36m"
+CLR="\033[m"
+
+log_error () {
+  printf "${CLR_RDB}✘ ${CLR_RD}$1${CLR}\n"
+  exit 1
+}
 
 while [ "$#" -gt 0 ]; do
   case $1 in
@@ -14,7 +21,7 @@ while [ "$#" -gt 0 ]; do
       EPS_CLEANUP=true
       ;;
     *)
-      log "error" "Unrecognized option: ${CLR_CYB}$1${CLR}" "" 1;;
+      log_error "Unrecognized option: ${CLR_CYB}$1${CLR}";;
   esac
   shift
 done
@@ -23,30 +30,30 @@ EPS_APP_NAME=${EPS_APP_NAME:-}
 export EPS_CLEANUP=${EPS_CLEANUP:-false}
 
 if [ -z "$EPS_APP_NAME" ]; then
-  log "error" "No application provided" "" 1
+  log_error "No application provided"
 fi
 
 export EPS_APP_CONFIG=$(wget --no-cache -qO- $EPS_BASE_URL/apps/$EPS_APP_NAME/config.sh)
 if [ $? -gt 0 ]; then
-  log "error" "No config found for ${CLR_CYB}$EPS_APP_NAME${CLR}" "" 1
+  log_error "No config found for ${CLR_CYB}$EPS_APP_NAME${CLR}"
 fi
 
 EPS_APP_INSTALL=$(wget --no-cache -qO- $EPS_BASE_URL/apps/$EPS_APP_NAME/install.sh)
 if [ $? -gt 0 ]; then
-  log "error" "No install script found for ${CLR_CYB}$EPS_APP_NAME${CLR}" "" 1
+  log_error "No install script found for ${CLR_CYB}$EPS_APP_NAME${CLR}"
 fi
 
-EPS_OS_NAME=$(os_name)
-export EPS_OS_DISTRO=$(os_distro)
+EPS_OS_NAME=$(uname)
+export EPS_OS_DISTRO=$(awk -F'=' '/^ID=/{ print $NF }' /etc/os-release)
 
-source <(echo -n "$EPS_APP_CONFIG")
-pms_header
-pms_check_os
+if [ "$EPS_OS_NAME" != "Linux" ]; then
+  log_error "OS not supported: ${CLR_CYB}$EPS_OS_NAME${CLR}"
+fi
 
 if [ "$EPS_OS_DISTRO" = "alpine" ]; then
   [ "$(command -v bash)" ] || apk add bash >/dev/null
 fi
 
-trap - ERR
+export EPS_UTILS=$(wget --no-cache -qO- $EPS_BASE_URL/utils/common.sh)
 bash -c "$EPS_APP_INSTALL"