a

ArmanTheParman · Feb 12, 2025 · c8aed6a · c8aed6a
1 parent fa66a21
commit c8aed6a
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 196 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+Version 3.54.0
+    -Premium features
+    -ParmaNas
 Version 3.53.0
     -LND Watchtower
     -Bitcoin update 28.1

diff --git a/src/MENUS/menu_add.sh b/src/MENUS/menu_add.sh
@@ -27,7 +27,7 @@ set_terminal_higher
 echo -en "
 ########################################################################################
 #                                                                                      #
-#    P A R M A N O D E --> Main Menu --> ${cyan}Install Menu$orange                                  #
+#    P A R M A N O D E --> Main Menu --> ${cyan}Add (Install) Menu$orange                            #
 #                                                                                      #
 ########################################################################################
 # $partial_install \033[88G#
@@ -41,12 +41,16 @@ echo -en "${bitcoin_new}" ; echo -en "
 #                                                                                      #
 #$cyan                      e)$orange           Extras ...                                         #
 #                                                                                      #
+#$blue                     pp)$blue           Premium ...        $orange                                #
+#                                                                                      #
 #                                                                                      #
 ########################################################################################
 "
 choose "xpmq" ; read choice 
 jump $choice || { invalid ; continue ; } ; set_terminal
 case $choice in
+q|Q) exit ;; p|P) return 1 ;; m|M) back2main ;;
+
 B|b|bitcoin|Bitcoin)
         if [[ -z $menuaddnewbitcoin ]] ; then
         set_terminal 
@@ -74,8 +78,6 @@ mm|MM|Mm|mM)
         return 0
         ;;
 
-m|M) back2main ;;
-
 w|W|wallets|Wallets)
         menu_add_wallets
         return 0
@@ -90,13 +92,12 @@ e|E)
         menu_add_extras
         return 0
         ;;
-
-    q|Q|quit|QUIT)
-        exit 0
-        ;;
-    p|P)
-        back2main
+
+pp)
+        menu_premium
+        return 0
         ;;
+
     *)
         invalid
         continue

diff --git a/src/MENUS/menu_add_extras.sh b/src/MENUS/menu_add_extras.sh
@@ -1,7 +1,7 @@
 function menu_add_extras {
 while true ; do
 menu_add_source
-if [[ -e $hp/parman_books ]] ; then UPDATE="${red}UPDATE$orange " ; endline="                 #" ; else unset UPDATE ; endline="                        #"; fi
+if [[ -e $hp/parman_books ]] ; then UPDATE="${red}UPDATE$orange " ; endline="                  #" ; else unset UPDATE ; endline="                         #"; fi
 set_terminal
 echo -en "
 ########################################################################################
@@ -11,19 +11,13 @@ echo -en "
 ########################################################################################
 #                                                                                      #
 #                                                                                      #
-#$cyan              rr)$orange      RAID - join drives together                                   #
+#$cyan              h)$orange       HTOP - check system resources                                  #
 #                                                                                      #
-#$cyan              pnas)$orange    ParmaNas - Network Attached Storage                           #
-#                                                                                      #
-#$cyan              h)$orange       HTOP - check system resources                                 #
-#                                                                                      #
-#$cyan              udev)$orange    Add UDEV rules for HWWs (only needed for Linux)               #
+#$cyan              udev)$orange    Add UDEV rules for HWWs (only needed for Linux)                #
 #                                                                                      #
 #$cyan              fb)$orange      ${UPDATE}Parman's recommended free books (pdfs)$endline
 #                                                                                      #
-#$cyan              cl)$orange      Core Lightning                                                #
-#                                                                                      #
-#$cyan              pm)$orange      ParMiner                                                      #
+#$cyan              cl)$orange      Core Lightning                                                 #
 #                                                                                      #
 ########################################################################################
 "
@@ -93,10 +87,6 @@ announce "Parmanode isn't configured to support Core Lightning, but it can insta
     command line or other means. Core Lightning may be implemende within Parmanode in 
     the future." 
 ;;
-pm)
-get_parminer
-;;
-
 
 *)
     invalid
@@ -109,61 +99,3 @@ return 0
 
 }
 
-
-function menu_qrencode {
-
-while true ; do
-set_terminal ; echo -en "
-########################################################################################
-                                     QR Encode
-########################################################################################
-
-
-                       ${pink}QREncode is installed on your system.
-
-
-$cyan
-                    info)$orange          Info fo DIY QR codes
-$cyan
-                    pub)$orange           QR of your computer's SSH pubkey
-
-
-########################################################################################
-"
-choose xpmq ; read choice 
-jump $choice || { invalid ; continue ; } ; set_terminal
-case $choice in
-quit|Q|q) exit ;; p|P) return 1 ;; m|M) back2main ;;
-info) qrencode_info ;;
-pub) 
-set_terminal_custom 50 100
-echo "Public key..."
-qrencode -t ANSIUTF8 "$(cat ~/.ssh/id_rsa.pub)"
-enter_continue
-;;
-
-*) invalid ;;
-esac
-done
-}
-
-function qrencode_info {
-set_terminal ; echo -en "
-########################################################################################
-                                  QREncode Info
-########################################################################################
-$orange
-    To use qrencode command manually, the syntax is ...
-$cyan
-                        qrencode -t ANSIUTF8 \"some text\"
-$orange
-    You can also QR the contents of a file ...
-$cyan
-                        qrencode -t ANSIUTF8 \"\$(cat /path/to/file)\"
-$orange
-    Don't omit the \" 
-
-########################################################################################
-"
-enter_continue
-}
diff --git a/src/MENUS/menu_premium.sh b/src/MENUS/menu_premium.sh
@@ -5,24 +5,16 @@ set_terminal
 echo -en "$blue
 ########################################################################################
 #                                                                                      #
-#    P A R M A N O D E --> Main Menu --> Install Menu  -->$cyan Premium      $blue                #
+#    P A R M A N O D E --> Main Menu --> Install Menu  -->$cyan Premium      $blue               #
 #                                                                                      #
 ########################################################################################
 #                                                                                      #
 #                                                                                      #
-#$cyan              rr)$blue        RAID - join drives together                                   #
+#$orange                pm)$blue        ParMiner                                                   #
 #                                                                                      #
-#$cyan              pnas)$blue      ParmaNas - Network Attached Storage                           #
+#$orange              pnas)$blue        ParmaNas - Network Attached Storage                        #
 #                                                                                      #
-#$cyan              h)$blue         HTOP - check system resources                                 #
-#                                                                                      #
-#$cyan              udev)$blue      Add UDEV rules for HWWs (only needed for Linux)               #
-#                                                                                      #
-#$cyan              fb)$blue        ${UPDATE}Parman's recommended free books (pdfs)$endline
-#                                                                                      #
-#$cyan              cl)$blue        Core Lightning                                                #
-#                                                                                      #
-#$cyan              pm)$blue        ParMiner                                                      #
+#$orange                rr)$blue        RAID - join drives together                                #
 #                                                                                      #
 ########################################################################################
 "
@@ -38,8 +30,15 @@ rr)
 
 pnas)
     [[ ! -e $dp/.parmanas_enabled ]] && {
-    announce "ParmaNas is not enabled by default in Parmanode; it is a
-    premium feature. Contact Parman for more info."
+    announce "ParmaNas (Network Attached Storage) is not enabled by default in Parmanode.
+
+    It comes with all purchased fully-synced ParmanodL laptops and ParmaCloud machines 
+    (16TB self-hosted cloud data + Parmanode Bitcoin Node.)
+
+    Contact Parman for more info, or see...
+$blue    
+    https://parmanode.com/parmanodl$orange"
+
     continue
     }
 
@@ -51,47 +50,7 @@ pnas)
     ./run_parmanas.sh
 
 ;;
-h|H|htop|HTOP|Htop)
-
-    if [[ $OS == "Mac" ]] ; then htop ; break ; return 0 ; fi
-    if ! which htop ; then sudo apt-get install htop -y >$dn 2>&1 ; fi
-    announce "To exit htop, hit$cyan q$orange"
-    htop
-;;
 
-udev|UDEV)
-
-    if grep -q udev-end $dp/installed.conf ; then
-    announce "udev already installed."
-    return 0
-    fi
-    udev
-;;
-fb|FB)
-get_books
-;;
-
-cl)
-announce "Parmanode isn't configured to support Core Lightning, but it can install it for
-    you. This means that any conflicts with other Parmanode-installed software will 
-    not be checked for or managed.
-
-    To install Core Lightning, it is recommended you uninstall LND, make sure Bitcoin 
-    is installed and running, then exit parmanode and restart it with this command: $cyan
-
-            rp install_core_lightning
-    $orange
-    To uninstall, do:$cyan
-            
-            rp uninstall_core_lightning
-    $orange
-    This will start the installation, and will get you to hit <enter> at various 
-    stages, as it downloads files and compiles from source.
-
-    There won't be any menus in Parmanode, you'll need to interact with it by the 
-    command line or other means. Core Lightning may be implemende within Parmanode in 
-    the future." 
-;;
 pm)
 get_parminer
 ;;
@@ -106,63 +65,4 @@ done
 
 return 0
 
-}
-
-
-function menu_qrencode {
-
-while true ; do
-set_terminal ; echo -en "
-########################################################################################
-                                     QR Encode
-########################################################################################
-
-
-                       ${pink}QREncode is installed on your system.
-
-
-$cyan
-                    info)$orange          Info fo DIY QR codes
-$cyan
-                    pub)$orange           QR of your computer's SSH pubkey
-
-
-########################################################################################
-"
-choose xpmq ; read choice 
-jump $choice || { invalid ; continue ; } ; set_terminal
-case $choice in
-quit|Q|q) exit ;; p|P) return 1 ;; m|M) back2main ;;
-info) qrencode_info ;;
-pub) 
-set_terminal_custom 50 100
-echo "Public key..."
-qrencode -t ANSIUTF8 "$(cat ~/.ssh/id_rsa.pub)"
-enter_continue
-;;
-
-*) invalid ;;
-esac
-done
-}
-
-function qrencode_info {
-set_terminal ; echo -en "
-########################################################################################
-                                  QREncode Info
-########################################################################################
-$orange
-    To use qrencode command manually, the syntax is ...
-$cyan
-                        qrencode -t ANSIUTF8 \"some text\"
-$orange
-    You can also QR the contents of a file ...
-$cyan
-                        qrencode -t ANSIUTF8 \"\$(cat /path/to/file)\"
-$orange
-    Don't omit the \" 
-
-########################################################################################
-"
-enter_continue
 }
diff --git a/src/tools/qrencde.sh b/src/tools/qrencde.sh
@@ -0,0 +1,57 @@
+function menu_qrencode {
+
+while true ; do
+set_terminal ; echo -en "
+########################################################################################
+                                     QR Encode
+########################################################################################
+
+
+                       ${pink}QREncode is installed on your system.
+
+
+$cyan
+                    info)$orange          Info fo DIY QR codes
+$cyan
+                    pub)$orange           QR of your computer's SSH pubkey
+
+
+########################################################################################
+"
+choose xpmq ; read choice 
+jump $choice || { invalid ; continue ; } ; set_terminal
+case $choice in
+quit|Q|q) exit ;; p|P) return 1 ;; m|M) back2main ;;
+info) qrencode_info ;;
+pub) 
+set_terminal_custom 50 100
+echo "Public key..."
+qrencode -t ANSIUTF8 "$(cat ~/.ssh/id_rsa.pub)"
+enter_continue
+;;
+
+*) invalid ;;
+esac
+done
+}
+
+function qrencode_info {
+set_terminal ; echo -en "
+########################################################################################
+                                  QREncode Info
+########################################################################################
+$orange
+    To use qrencode command manually, the syntax is ...
+$cyan
+                        qrencode -t ANSIUTF8 \"some text\"
+$orange
+    You can also QR the contents of a file ...
+$cyan
+                        qrencode -t ANSIUTF8 \"\$(cat /path/to/file)\"
+$orange
+    Don't omit the \" 
+
+########################################################################################
+"
+enter_continue
+}
diff --git a/version.conf b/version.conf
@@ -1,5 +1,5 @@
-version="v3.53.0"
+version="v3.54.0"
 vMajor=3
-vMinor=53
+vMinor=54
 vPatch=0
 #Leave this line here, and don't change line numbers