From 08273cdea2b468de6c2aed7cd267eef8d7d8d6bc Mon Sep 17 00:00:00 2001 From: MrDoobPG <46342172+MrDoobPG@users.noreply.github.com> Date: Sun, 8 Sep 2019 00:15:16 +0200 Subject: [PATCH] 11 --- menu/functions/install.sh | 28 ++-------------------------- menu/pgbox/endbanner.sh | 4 ++-- menu/pgbox/pgbox_corepersonal.yml | 18 ++++++++++++++++-- menu/pgbox/pgboxcommunity.sh | 11 ++++++----- menu/pgbox/pgboxcore.sh | 26 +++++++++++++++++--------- menu/pgbox/pgboxcore.yml | 4 ++-- menu/pgbox/pgboxselect.sh | 10 +++++----- menu/pgui/localspace.yml | 2 +- 8 files changed, 51 insertions(+), 52 deletions(-) diff --git a/menu/functions/install.sh b/menu/functions/install.sh index c201e35..4ae571c 100644 --- a/menu/functions/install.sh +++ b/menu/functions/install.sh @@ -93,7 +93,6 @@ pginstall() { fi portainer - pgui core motd &>/dev/null & core hetzner &>/dev/null & core gcloud @@ -254,29 +253,6 @@ mergerinstall() { apt install -y ./mergerfs*_amd64.deb rm mergerfs*_amd64.deb - tee <<-EOF - -━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -↘️ MergerFS has been updated! Requires PG Clone redeployment. -━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ - -INFORMATION: MergerFS was updated on your system and brings performance improvements! -Users have reported faster plex scanning and playback with the new mergerfs and pgclone configuration. - -ATTENTION: -You are required to re-deploy your mounts in the PG Clone menu (option 4, option A). -It is advised to check the VFS mount settings in the options menu (C,2), as options have been updated. - -WARNING: This is not optional, you must redeploy your mounts in the PG Clone menu. -Your mounts are currently down until you re-deploy pg clone as it requires configuration updates! -This is not done for you, you must go to the PG Clone Menu (option 4) and deploy (option A). - -We apologize for this one-time inconvenience. - -━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -EOF - read -p 'Acknowledge Info | Press [ENTER] ' typed http://$program.pgblitz.com +🌎 Access Configuration Info ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ EOF @@ -70,7 +70,7 @@ if [[ "$program" == *"sonarr"* ]] || [[ "$program" == *"radarr"* ]] || [[ "$prog tee <<-EOF ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -💬 Manual Configuration Required > http://$program.pgblitz.com +💬 Manual Configuration Required ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ $program requires additional manual configuration! diff --git a/menu/pgbox/pgbox_corepersonal.yml b/menu/pgbox/pgbox_corepersonal.yml index 15b098f..7977cdd 100644 --- a/menu/pgbox/pgbox_corepersonal.yml +++ b/menu/pgbox/pgbox_corepersonal.yml @@ -2,17 +2,31 @@ - hosts: localhost gather_facts: false tasks: + - name: Check if Image Variable Exists + stat: + path: '/opt/coreapps' + register: pathcheck + + - name: 'Transfer Image Variable' + shell: 'rm -rf /opt/coreapps' + when: pathcheck.stat.exists + - name: Register User shell: 'cat /var/plexguide/boxcore.user' register: boxuser + - name: Register Repo + shell: 'cat /var/plexguide/boxrepo.repo' + register: boxrepo + - name: Register Branch shell: 'cat /var/plexguide/boxcore.branch' register: boxbranch - - name: 'Cloning {{boxuser.stdout}} Core Apps' + - name: 'Cloning {{boxuser.stdout}} Apps' git: - repo: 'https://github.com/{{boxuser.stdout}}/Apps-Core' + repo: 'https://github.com/{{boxuser.stdout}}/{{boxrepo.stdout}}' dest: '/opt/coreapps' + clone: yes version: '{{boxbranch.stdout}}' force: yes diff --git a/menu/pgbox/pgboxcommunity.sh b/menu/pgbox/pgboxcommunity.sh index c03477a..544671f 100644 --- a/menu/pgbox/pgboxcommunity.sh +++ b/menu/pgbox/pgboxcommunity.sh @@ -123,7 +123,7 @@ question1() { tee <<-EOF ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -🚀 PGBox ~ Multi-App Installer 📓 Reference: pgbox.pgblitz.com +🚀 Multi-App Installer ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 📂 Potential Apps to Install @@ -251,7 +251,7 @@ pinterface() { tee <<-EOF ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -🚀 PG Community Box Edition! 📓 Reference: community.pgblitz.com +🚀 Community Box Edition! ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 💬 User: $boxuser | Branch: $boxbranch @@ -314,16 +314,17 @@ mainbanner() { tee <<-EOF ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -🚀 PG Community Box Edition! 📓 Reference: community.pgblitz.com +🚀 Community Box Edition! ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -💬 Community Box apps simplify their usage within PGBlitz! PG provides more +💬 Community Box apps simplify their usage within PGBlitz! +PG provides more focused support and development based on community usage. 💬 The Personal Forked option will install your version of Community Box. Good for testing or for personal mods! Ensure that it exist prior to use! -[1] Utilize Community Box - PGBlitz's +[1] Utilize Community Box [2] Utilize Community Box - Personal (Forked) [Z] Exit diff --git a/menu/pgbox/pgboxcore.sh b/menu/pgbox/pgboxcore.sh index c9ae3c3..5cc6a56 100644 --- a/menu/pgbox/pgboxcore.sh +++ b/menu/pgbox/pgboxcore.sh @@ -123,7 +123,7 @@ question1() { tee <<-EOF ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -🚀 PGBox ~ Multi-App Installer 📓 Reference: pgbox.pgblitz.com +🚀 PTS ~ Multi-App Installer ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 📂 Potential Apps to Install @@ -245,15 +245,20 @@ EOF pinterface() { boxuser=$(cat /var/plexguide/boxcore.user) + boxrepo=$(cat /var/plexguide/boxrepo.repo) boxbranch=$(cat /var/plexguide/boxcore.branch) + tee <<-EOF ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -🚀 PG Core Box Edition! 📓 Reference: core.pgblitz.com +🚀 PTS Core Box Edition! ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -💬 User: $boxuser | Branch: $boxbranch +💬 +User: $boxuser +Repo: $boxrepo +Branch: $boxbranch [1] Change User Name & Branch [2] Deploy Core Box - Personal (Forked) @@ -274,19 +279,21 @@ EOF 💬 IMPORTANT MESSAGE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -Username & Branch are both case sensitive! +Username / Branch & Repo are both case sensitive! ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ EOF read -p 'Username | Press [ENTER]: ' boxuser /var/plexguide/boxcore.user + echo "$boxrepo" >/var/plexguide/boxrepo.repo echo "$boxbranch" >/var/plexguide/boxcore.branch pinterface ;; 2) - existcheck=$(git ls-remote --exit-code -h "https://github.com/$boxuser/Apps-Core" | grep "$boxbranch") + existcheck=$(git ls-remote --exit-code -h "https://github.com/$boxuser/$boxrepo" | grep "$boxbranch") if [ "$existcheck" == "" ]; then echo read -p '💬 Exiting! Forked Version Does Not Exist! | Press [ENTER]: ' typed