From 45be57e5e3f34134272b690e3368e6e1feef4452 Mon Sep 17 00:00:00 2001 From: MrDoobPG <46342172+MrDoobPG@users.noreply.github.com> Date: Sat, 7 Sep 2019 16:10:32 +0200 Subject: [PATCH] some updates --- menu/functions/install.sh | 31 ++++++++++++++++--------------- menu/functions/start.sh | 10 ++++++++-- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/menu/functions/install.sh b/menu/functions/install.sh index acdb74b6..5659c464 100644 --- a/menu/functions/install.sh +++ b/menu/functions/install.sh @@ -107,6 +107,7 @@ pginstall() { core mountcheck emergency pgdeploy + localspace } core() { @@ -129,10 +130,10 @@ ansible-playbook /opt/plexguide/menu/pg.yml --tags update &>/dev/null & } aptupdate() { - yes | apt-get update - yes | apt-get install software-properties-common - yes | apt-get install sysstat nmon - sed -i 's/false/true/g' /etc/default/sysstat + ansible-playbook /opt/plexguide/menu/pg.yml --tags update &>/dev/null & + apt-get install software-properties-common &>/dev/null & + apt-get install sysstat nmon &>/dev/null & + sed -i 's/false/true/g' /etc/default/sysstat } customcontainers() { @@ -288,17 +289,18 @@ motd() { ansible-playbook /opt/plexguide/menu/motd/motd.yml } -# mountcheck() { - # bash /opt/plexguide/menu/pgcloner/solo/pgui.sh - # ansible-playbook /opt/pgui/pgui.yml - # ansible-playbook /opt/plexguide/menu/pgui/mcdeploy.yml -# } +mountcheck() { + # bash /opt/plexguide/menu/pgcloner/solo/pgui.sh + # ansible-playbook /opt/pgui/pgui.yml + ansible-playbook /opt/plexguide/menu/pgui/mcdeploy.yml +} -# localspace() { +localspace() { # ansible-playbook /opt/pgui/pgui.yml - # ansible-playbook /opt/plexguide/menu/pgui/localspace.yml - - # tee <<-EOF + ansible-playbook /opt/plexguide/menu/pgui/localspace.yml + } + +# tee <<-EOF # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ # ↘️ PG User Interface (PGUI) Installed / Updated @@ -314,8 +316,7 @@ motd() { # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ # EOF # read -p 'Acknowledge Info | Press [ENTER] ' typed /dev/null 2>&1 diff --git a/menu/functions/start.sh b/menu/functions/start.sh index f1090ca8..d45e3fe5 100644 --- a/menu/functions/start.sh +++ b/menu/functions/start.sh @@ -23,8 +23,9 @@ EOF downloadpg() { rm -rf /opt/plexguide - git clone https://github.com/MrDoobPG/PGBlitz.com.git /opt/plexguide && cp /opt/plexguide/menu/interface/alias/templates/plexguide /bin/ - cp /opt/plexguide/menu/interface/alias/templates/plexguide /bin/plexguide + git clone --single-branch https://github.com/MrDoobPG/PGBlitz.com.git /opt/plexguide 1>/dev/null 2>&1 + ansible-playbook /opt/plexguide/menu/alias/alias.yml 1>/dev/null 2>&1 + } missingpull() { @@ -57,6 +58,11 @@ EOF fi } +owned() { + chown -cR 1000:1000 /opt/plexguide 1>/dev/null 2>&1 + chmod -R 775 /opt/plexguide 1>/dev/null 2>&1 +} + exitcheck() { bash /opt/plexguide/menu/version/file.sh file="/var/plexguide/exited.upgrade"