update

linupx-scripts.sh

@@ -3,14 +3,16 @@
 
 action="$1"
 FOLDER='/opt/LinUPx'
-VERS='4.01242019'
+VERS='4.01282019'
 
 if [ ! -f /opt/LinUPx/settings.conf ]; then
 	echo -ne "useAutoremove=1
 opennms=false" > /opt/LinUPx/settings.conf
 fi
 
-source /opt/LinUPx/settings.conf
+source /opt/idssys/LinUPx/settings.conf
+source /opt/idssys/defaults/colors.inc
+source /opt/idssys/defaults/default.inc
 
 Color_Off='\033[0m'
 Blue='\033[0;34m'
@@ -23,25 +25,6 @@ Red='\033[10;31m'
 LRed='\033[1;31m'
 
 
-if type apt &>/dev/null; then
-	ATYPE="apt"
-	if [ "$EUID" -ne 0 ]; then APTFUNC='sudo apt'
-	else APTFUNC='apt'
-	fi
-elif type apt-get &>/dev/null; then
-	ATYPE="apt-get"
-	if [ "$EUID" -ne 0 ]; then APTFUNC='sudo apt-get'
-	else APTFUNC='apt-get'
-	fi
-elif type yum &>/dev/null; then
-	ATYPE="yum"
-	if [ "$EUID" -ne 0 ]; then APTFUNC='sudo yum'
-	else APTFUNC='yum'
-	fi
-else
-	ATYPE="unknown"
-fi
-
 ######## NEWRELIC REMOVAL ########
 if [ -e /etc/apt/sources.list.d/newrelic.list ]; then
     $APTFUNC remove -y newrelic-sysmond

run.sh

@@ -3,9 +3,17 @@
 
 source /opt/LinUPx/settings.conf
 
-cd /opt/LinUPx
-#echo ""
 
+
+if [ ! -d "/opt/idssys/LinUPx" ]; then
+	mv /opt/LinUPx /opt/idssys/
+	rm -Rf /opt/idssys/LinUPx
+	ln -s /opt/idssys/LinUPx/run.sh /usr/local/bin/runup
+fi
+
+
+cd /opt/idssys/LinUPx
+#echo ""
 if [ "$1" != "update" ] && [ "$1" != "up" ]; then
 	if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then 
 		git fetch origin master >/dev/null 2>&1
@@ -14,11 +22,9 @@ if [ "$1" != "update" ] && [ "$1" != "up" ]; then
 		git repack -ad >/dev/null 2>&1
 		git prune >/dev/null 2>&1
 		git pull >/dev/null 2>&1
-		#echo ""
-		#echo -e "\e[92m\e[1mLinUPx update completed\e[0m"
 	fi
 fi
 
-./linupx-scripts.sh $1 $2
+/opt/idssys/linupx-scripts.sh $1 $2
 
 exit 0