diff --git a/default.inc b/default.inc index 37ad5b7..2d1cfa9 100755 --- a/default.inc +++ b/default.inc @@ -16,6 +16,17 @@ EXIT1() { exit 0 } +if type apt &>/dev/null; then + ATYPE="apt" +elif type apt-get &>/dev/null; then + ATYPE="apt-get" +elif type yum &>/dev/null; then + ATYPE="yum" +else + ATYPE="unknown" + exit 1 +fi + declare -A abet abet[0]="a" abet[1]="b" diff --git a/glances-install.sh b/install-glances.sh similarity index 100% rename from glances-install.sh rename to install-glances.sh diff --git a/linupx-install.sh b/install-linupx.sh similarity index 85% rename from linupx-install.sh rename to install-linupx.sh index 7ff2aea..f23ddbe 100755 --- a/linupx-install.sh +++ b/install-linupx.sh @@ -3,17 +3,7 @@ source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/colors.inc)" source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/default.inc)" - -if type apt &>/dev/null; then - ATYPE="apt" -elif type apt-get &>/dev/null; then - ATYPE="apt-get" -elif type yum &>/dev/null; then - ATYPE="yum" -else - ATYPE="unknown" - exit 1 -fi + if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}" else APTFUNC="${ATYPE}" diff --git a/vnc-install-ubuntu.sh b/install-vnc.sh similarity index 100% rename from vnc-install-ubuntu.sh rename to install-vnc.sh diff --git a/webmin-install.sh b/install-webmin.sh similarity index 100% rename from webmin-install.sh rename to install-webmin.sh diff --git a/nodemgmt-install.sh b/nodemgmt-install.sh new file mode 100755 index 0000000..f23ddbe --- /dev/null +++ b/nodemgmt-install.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash +# Wrapper script for install, for easier execution via URL. + +source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/colors.inc)" +source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/default.inc)" + + +if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}" +else APTFUNC="${ATYPE}" +fi +echo "" +echo -e "${CS[color,LightGreen]}LinUPx Installation Script${CS[color,Default]}" + +do_with_root $APTFUNC -y install wget curl git + +do_with_root set -eu +# $PREFIX git -c http.sslVerify=false clone https://git.schroedercity.com/voltron/LinUPx.git /opt/LinUPx +do_with_root git clone https://git.schroedercity.com/voltron/LinUPx.git /opt/LinUPx +do_with_root ln -s /opt/LinUPx/run.sh /usr/local/bin/runup +echo -e "useAutoremove=1 +opennms=false" > /opt/LinUPx/settings.conf + + +echo "" +echo -e "${CS[color,LightYellow]}LinUPx has been Installed${CS[color,Default]}" +echo "" +echo -e "To run updates, use the command: ${CS[color,Green]}runup${CS[color,Default]}" +echo "" +echo "" + +exit 0 \ No newline at end of file diff --git a/linupx-uninstall.sh b/uninstall-linupx.sh similarity index 74% rename from linupx-uninstall.sh rename to uninstall-linupx.sh index 55ca50d..52572be 100755 --- a/linupx-uninstall.sh +++ b/uninstall-linupx.sh @@ -3,17 +3,7 @@ source /dev/stdin <<< "$(curl -sL http://scity.xyz/colorsinc)" source /dev/stdin <<< "$(curl -sL http://scity.xyz/defaultinc)" - -if type apt &>/dev/null; then - ATYPE="apt" -elif type apt-get &>/dev/null; then - ATYPE="apt-get" -elif type yum &>/dev/null; then - ATYPE="yum" -else - ATYPE="unknown" - exit 1 -fi + if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}" else APTFUNC="${ATYPE}"