Skip to content

Commit

Permalink
11
Browse files Browse the repository at this point in the history
  • Loading branch information
MrDoobPG authored and MrDoobPG committed Sep 7, 2019
1 parent a4ad856 commit 08273cd
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 52 deletions.
28 changes: 2 additions & 26 deletions menu/functions/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ pginstall() {
fi

portainer
pgui
core motd &>/dev/null &
core hetzner &>/dev/null &
core gcloud
Expand Down Expand Up @@ -254,38 +253,15 @@ 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 </dev/tty

}

motd() {
ansible-playbook /opt/plexguide/menu/motd/motd.yml
}

mountcheck() {
bash /opt/plexguide/menu/pgcloner/solo/pgui.sh
ansible-playbook /opt/pgui/pgui.yml
# bash /opt/plexguide/menu/pgcloner/solo/pgui.sh
# ansible-playbook /opt/pgui/pgui.yml
ansible-playbook /opt/plexguide/menu/pgui/mcdeploy.yml
}

Expand Down
4 changes: 2 additions & 2 deletions menu/pgbox/endbanner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if [ "$program" == "plex" ]; then extra="/web"; else extra=""; fi
tee <<-EOF
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
🌎 Access Configuration Info > http://$program.pgblitz.com
🌎 Access Configuration Info
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
EOF
Expand Down Expand Up @@ -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!
Expand Down
18 changes: 16 additions & 2 deletions menu/pgbox/pgbox_corepersonal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 6 additions & 5 deletions menu/pgbox/pgboxcommunity.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ question1() {
tee <<-EOF
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
🚀 PGBox ~ Multi-App Installer 📓 Reference: pgbox.pgblitz.com
🚀 Multi-App Installer
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
📂 Potential Apps to Install
Expand Down Expand Up @@ -251,7 +251,7 @@ pinterface() {
tee <<-EOF
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
🚀 PG Community Box Edition! 📓 Reference: community.pgblitz.com
🚀 Community Box Edition!
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
💬 User: $boxuser | Branch: $boxbranch
Expand Down Expand Up @@ -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
Expand Down
26 changes: 17 additions & 9 deletions menu/pgbox/pgboxcore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ question1() {
tee <<-EOF
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
🚀 PGBox ~ Multi-App Installer 📓 Reference: pgbox.pgblitz.com
🚀 PTS ~ Multi-App Installer
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
📂 Potential Apps to Install
Expand Down Expand Up @@ -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)
Expand All @@ -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 </dev/tty
read -p 'REPO | Press [ENTER]: ' boxrepo </dev/tty
read -p 'Branch | Press [ENTER]: ' boxbranch </dev/tty
echo "$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 </dev/tty
Expand All @@ -313,16 +320,16 @@ mainbanner() {
tee <<-EOF
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
🚀 PG Core Box Edition! 📓 Reference: core.pgblitz.com
🚀 PTS APP Box Edition!
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
💬 Core Box apps simplify their usage within PGBlitz! PG provides more
focused support and development based on core usage.
💬 ´Core Box apps simplify their usage within PTS!
PG provides more focused support and development based on core usage.
💬 The Personal Forked option will install your version of Core Box. Good
for testing or for personal mods! Ensure that it exist prior to use!
[1] Utilize Core Box - PGBlitz's
[1] Utilize Core Box
[2] Utilize Core Box - Personal (Forked)
[Z] Exit
Expand All @@ -341,6 +348,7 @@ EOF
;;
2)
variable /var/plexguide/boxcore.user "NOT-SET"
variable /var/plexguide/boxrepo.repo "NOT-SET"
variable /var/plexguide/boxcore.branch "NOT-SET"
pinterface
;;
Expand Down
4 changes: 2 additions & 2 deletions menu/pgbox/pgboxcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

- name: Cloning Core Apps
git:
repo: 'https://github.com/PGBlitz/Apps-Core'
repo: 'https://github.com/MrDoobPG/Apps-Core'
dest: /opt/coreapps
version: 'v8.6'
version: 'dev'
force: yes
10 changes: 5 additions & 5 deletions menu/pgbox/pgboxselect.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ mainstart() {
tee <<-EOF
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
🚀 PG Box Apps Interface Selection 📓 Reference: pgbox.pgblitz.com
🚀 Box Apps Interface Selection
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
💬 PG Box installs a series of Core and Community applications!
💬 PTS Box installs a series of Core and Community applications!
[1] PG Box: Core
[2] PG Box: Community
[3] PG Box: Removal
[1] PTS : Core
[2] PGBlitzs Box : Community [ be careful ]
[3] Apps : Removal
[Z] Exit
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
Expand Down
2 changes: 1 addition & 1 deletion menu/pgui/localspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
- name: localspace Service
template:
src: /opt/coreapps/apps/templates/pgui/localspace.service
src: /opt/plexguide/menu/pgui/localspace.service
dest: /etc/systemd/system/localspace.service
force: yes
Expand Down

0 comments on commit 08273cd

Please sign in to comment.