comment init

MHA-Team · Dec 4, 2019 · bc8eabb · bc8eabb
1 parent 2859171
commit bc8eabb
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 63 deletions.
diff --git a/menu/dlpath/dlpath.sh b/menu/dlpath/dlpath.sh
@@ -60,7 +60,7 @@ elif [ "$typed" == "2" ]; then
 
 🌵  Current Processing Disk : $pgpath
 
-☑️   Type the path as show in the examples below! PG will then attempt
+☑️   Type the path as show in the examples below! PTS will then attempt
 to see if your path exists!
 
 Examples:

diff --git a/menu/installer/folders.yml b/menu/installer/folders.yml
@@ -45,33 +45,27 @@
     ############ GCrypt
     - name: GCrypt Check
       stat:
-        path: '{{path.stdout}}/gcrypt'
+        path: '/mnt/gcrypt'
       register: gcrypt
 
     - name: Create GCrypt Folders
       file: 'path={{item}} state=directory mode=0775 owner=1000 group=1000'
       with_items:
-        - '{{path.stdout}}/gcrypt/tv'
-        - '{{path.stdout}}/gcrypt/movies'
-        - '{{path.stdout}}/gcrypt/music'
-        - '{{path.stdout}}/gcrypt/ebooks'
-        - '{{path.stdout}}/gcrypt/abooks'
+        - '/mnt/gcrypt/tv'
+        - '/mnt/gcrypt/movies'
       when: gcrypt.stat.exists == False
       ignore_errors: yes
     ############ TCrypt
     - name: TCrypt Check
       stat:
-        path: '{{path.stdout}}/tcrypt'
+        path: '/mnt/tcrypt'
       register: tcrypt
 
     - name: Create TCrypt Folders
       file: 'path={{item}} state=directory mode=0775 owner=1000 group=1000'
       with_items:
-        - '{{path.stdout}}/tcrypt/tv'
-        - '{{path.stdout}}/tcrypt/movies'
-        - '{{path.stdout}}/tcrypt/music'
-        - '{{path.stdout}}/tcrypt/ebooks'
-        - '{{path.stdout}}/tcrypt/abooks'
+        - '/mnt/tcrypt/tv'
+        - '/mnt/tcrypt/movies'
       when: tcrypt.stat.exists == False
       ignore_errors: yes
 
@@ -91,91 +85,79 @@
     ############ PGUnion
     - name: Union Check
       stat:
-        path: '{{path.stdout}}/unionfs'
+        path: '/mnt/unionfs'
       register: pgunion
 
     - name: Create Union Folders
       file: 'path={{item}} state=directory mode=0775 owner=1000 group=1000'
       with_items:
-        - '{{path.stdout}}/unionfs'
+        - '/mnt/unionfs'
       when: pgunion.stat.exists == False
       ignore_errors: yes
 
     ############ TMP
     - name: TMP Check
       stat:
-        path: '{{path.stdout}}/tmp'
+        path: '/mnt/tmp'
       register: tmp
 
     - name: Create Temp Folder
       file: 'path={{item}} state=directory'
       with_items:
-        - '{{path.stdout}}/tmp'
+        - '/mnt/tmp'
       when: tmp.stat.exists == False
       ignore_errors: yes
 
     ############ GDrive
     - name: GDrive Check
       stat:
-        path: '{{path.stdout}}/gdrive'
+        path: '/mnt/gdrive'
       register: gdrive
 
     - name: Create GDrive Folders
       file: 'path={{item}} state=directory mode=0775 owner=1000 group=1000'
       with_items:
-        - '{{path.stdout}}/gdrive'
-        - '{{path.stdout}}/gdrive/tv'
-        - '{{path.stdout}}/gdrive/movies'
-        - '{{path.stdout}}/gdrive/music'
-        - '{{path.stdout}}/gdrive/ebooks'
-        - '{{path.stdout}}/gdrive/abooks'
+        - '/mnt/gdrive'
+        - '/mnt/gdrive/tv'
+        - '/mnt/gdrive/movies'
       when: gdrive.stat.exists == False
       ignore_errors: yes
     ############ TCrypt
     - name: Create TCrypt Folders
       file: 'path={{item}} state=directory mode=0775 owner=1000 group=1000'
       with_items:
-        - '{{path.stdout}}/tcrypt'
-        - '{{path.stdout}}/tcrypt/tv'
-        - '{{path.stdout}}/tcrypt/movies'
-        - '{{path.stdout}}/tcrypt/music'
-        - '{{path.stdout}}/tcrypt/ebooks'
-        - '{{path.stdout}}/tcrypt/abooks'
+        - '/mnt/tcrypt'
+        - '/mnt/tcrypt/tv'
+        - '/mnt/tcrypt/movies'
       when: gdrive.stat.exists == False
       ignore_errors: yes
 
     ############ TDrive
     - name: TDrive Check
       stat:
-        path: '{{path.stdout}}/tdrive'
+        path: '/mnt/tdrive'
       register: tdrive
 
     - name: Create TDrive Folders
       file: 'path={{item}} state=directory mode=0775 owner=1000 group=1000'
       with_items:
-        - '{{path.stdout}}/tdrive'
-        - '{{path.stdout}}/tdrive/tv'
-        - '{{path.stdout}}/tdrive/movies'
-        - '{{path.stdout}}/tdrive/music'
-        - '{{path.stdout}}/tdrive/ebooks'
-        - '{{path.stdout}}/tdrive/abooks'
+        - '/mnt/tdrive'
+        - '/mnt/tdrive/tv'
+        - '/mnt/tdrive/movies'
       when: tdrive.stat.exists == False
       ignore_errors: yes
 
     ############ Encrypt
     - name: Encrypt Check
       stat:
-        path: '{{path.stdout}}/encrypt'
+        path: '/mnt/encrypt'
       register: encrypt
 
     - name: Create Encrypt Folders
       file: 'path={{item}} state=directory mode=0775 owner=1000 group=1000'
       with_items:
-        - '{{path.stdout}}/encrypt/tv'
-        - '{{path.stdout}}/encrypt/movies'
-        - '{{path.stdout}}/encrypt/music'
-        - '{{path.stdout}}/encrypt/ebooks'
-        - '{{path.stdout}}/encrypt/abooks'
+        - '/mnt/encrypt/tv'
+        - '/mnt/encrypt/movies'
       when: encrypt.stat.exists == False
       ignore_errors: yes
 
@@ -187,16 +169,14 @@
         - '/opt/communityapps'
         - '/opt/coreapps'
         - '/var/plexguide'
-        - '{{path.stdout}}/move'
+        - '/mnt/move'
         - '/var/plexguide/logs'
         - '/opt/appdata/plexguide/keys/unprocessed'
         - '/opt/appdata/plexguide/keys/processed'
         - '/opt/appdata/plexguide/keys/badjson'
-        - '{{path.stdout}}/pgops'
-        - '{{path.stdout}}/downloads'
+        - '{{path.stdout}}/downloads
         - '{{path.stdout}}/nzb'
         - '{{path.stdout}}/torrent'
-        - '{{path.stdout}}/torrent/watch'
         - '{{path.stdout}}/move'
         - '/opt/plexguide/log'
         - '/opt/plexguide/roles/log'

diff --git a/menu/multihd/functions/addpoint.sh b/menu/multihd/functions/addpoint.sh
@@ -76,7 +76,6 @@ EOF
     addpoint
   fi
 
-  # Checks to Make Sure BoneHead doesn't store the same path twice
   checkcheck3=$(cat /var/plexguide/multihd.paths | grep "$addpath")
   if [[ "$checkcheck3" != "" ]]; then
     tee <<-EOF

diff --git a/menu/multihd/functions/outputstart.sh b/menu/multihd/functions/outputstart.sh
@@ -31,12 +31,8 @@ EOF
 
 multihdstartinput() {
     case $typed in
-    1)
-        addpoint
-        ;;
-    2)
-        removepoint
-        ;;
+    1) addpoint ;;
+    2) removepoint ;;
     3)
         tee <<-EOF
 
@@ -60,15 +56,9 @@ EOF
 
         multihdstart
         ;;
-    z)
-        exit
-        ;;
-    Z)
-        exit
-        ;;
-    *)
-        multihdstart
-        ;;
+    z) exit ;;
+    Z) exit ;;
+    *) multihdstart ;;
     esac
     multihdstart
 }