Merge branch 'development' into osprober

Xmetalfanx · Aug 28, 2023 · e285472 · e285472
2 parents ba9adad + 90f63cf
commit e285472
Show file tree

Hide file tree

Showing 65 changed files with 399 additions and 1,212 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,5 @@ updateInfo.txt
 otherfiles/gitsetup.sh
 node_modules/*
 yarn.lock
-setting/*
+setting/*
+apt.txt
diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ In a Terminal run `git clone https://github.com/xmetalfanx/linuxscripts.git && c
 | Solus       |                            |                                                     |
 | Ubuntu      | 18.04, 20.04, 22.04, 23.04 | Elementary, Linux Lite, Linux Mint, "\*buntu Spins" |
 
-- Ubuntu: 18.04 Bionic, 20.04 Focal, 22.04 Jammy, 23.04 Lunar
+- Ubuntu: 20.04 Focal, 22.04 Jammy, 23.04 Lunar
 
 ### Testing related
 

diff --git a/debgetrefactor.md b/debgetrefactor.md
@@ -0,0 +1,12 @@
+| Program Name     | deb-get method | non deb-get method       |
+| ---------------- | -------------- | ------------------------ |
+| Audio Recorder   |                | Pass                     |
+| Deadbeef         |                | Pass - Notice displays   |
+| Google Chrome    |                | Pass - Notice displays   |
+| appImageLauncher |                | Not 100% sure            |
+| gitkraken        |                | Pass                     |
+| strawberry       |                | Pass                     |
+| vivaldi          |                | Pass                     |
+| vscode           |                | fails to download DEB \* |
+
+- going to website via browser gives a 404 error, downloading
diff --git a/documentation/Outline.txt b/documentation/Outline.txt
@@ -12,7 +12,7 @@ Script runs
 What info I know from lsb_release?
     - Codename: 
         - mainly useful with ubuntu releases, detecting the version 
-        - also if some codenames are detected ... say "bionic" here ... it can be safely assumed that you ARE ON an Ubuntu release 
+        - also if some codenames are detected ... say "focal" here ... it can be safely assumed that you ARE ON an Ubuntu release 
 
     -Release: 
         - some distros like arch have "rolling" 

diff --git a/functions/check/f_ubuntuCheck.cfg b/functions/check/f_ubuntuCheck.cfg
@@ -14,7 +14,7 @@ function elementaryVersionCheck() {
 
 	case ${VERSION_CODENAME} in 
 
-		juno|hera|odin|jólnir|horus) echo -e "You are on a supported version of ElementaryOS, ${VERSION_CODENAME}" ;;
+		odin|jólnir|horus) echo -e "You are on a supported version of ElementaryOS, ${VERSION_CODENAME}" ;;
 
 		*) echo -e "Elementary either not detected or not supported" ;; 
 
@@ -29,7 +29,7 @@ function ubuntuVersionCheck() {
 	# Supported? ... yes or no
 	case ${ubuntuBranch} in
 
-		bionic|focal|jammy)
+		focal|jammy)
 			supported="yes" && ubuntuLTS="yes" && ubuntuBranchMessage="You are currently on a supported ${bold}Long Term Supported version ${normal}of Ubuntu" ;;
 
 		lunar) 

diff --git a/functions/debian/f_debian.cfg b/functions/debian/f_debian.cfg
@@ -148,6 +148,7 @@ function debianLinuxFirmmare() {
 
 	clear
     fancy_message action "Installing Firmware related packages"
+    // July 2023: gdebi still needed? ... probably not 
     installApp "gdebi firmware-linux-free firmware-linux-nonfree"
 
     userPrompt

diff --git a/functions/info/specific/f_getGTKInfo.cfg b/functions/info/specific/f_getGTKInfo.cfg
@@ -30,8 +30,8 @@ function gtkVersionDetection() {
 
 # 	 esac
 
-
-	gtkVersion=$(inxi -Sxx | awk '/GTK/ {print $10}')
+	# late Aug 2023 idea 
+	gtkVersion=$(gtk-launch --version)
 
 }
 

diff --git a/functions/menus/submenus/software/f_productivitySoftwareMenu.cfg b/functions/menus/submenus/software/f_productivitySoftwareMenu.cfg
@@ -4,6 +4,7 @@ productivity_menu_items=(
 	3 "Install Codium (open-source VSCode)"
 	4 "Install GitKraken"
 	5 "Install Typora"
+	6 "Install Micro Text Editor"
 	S "Return to Main Software Menu"
 	M "Return to Main Menu"
 	Q "Exit to Prompt"
@@ -18,6 +19,7 @@ function productivityMenuCaseStatement() {
 		3) installVSCodium ;;
 		4) installGitKraken ;;
 		5) installTypora ;;
+		6) installMicroTextEditor && userPrompt ;; 
 		[sS]) mainSoftwareMenuType ;;
 		[mM]) mainMenuType ;;
 		[qQ]) quitScript  ;;

diff --git a/functions/menus/submenus/software/f_shellsSoftwareMenu.cfg b/functions/menus/submenus/software/f_shellsSoftwareMenu.cfg
@@ -1,7 +1,9 @@
 shells_menu_items=(
-	1 "Install fish shell, and Oh-My-Fish"
-	2 "Install zsh Shell, and Oh-My-zsh"
-	3 "[NOT coded yet] Install Powerline"
+	1 "Install fish Shell, and Oh-My-Fish"
+	2 "Install zsh Shell (Vanilla)"
+	3 "Install zsh Shell and a few extra items (no Oh-My-Zsh)"
+	4 "Install zsh Shell and Oh-My-ZSH"
+	5 "Install zsh Shell and Zap Plugin Manager"
 	M "Return to Main Menu"
 	Q "Exit to Prompt"
 )
@@ -10,8 +12,10 @@ function shellSoftwareMenuCaseStatement() {
 
 	case $shellSoftwareMenuSelection in
 		1) metaInstallFishShell ;;
-		2) metaInstallZSHShell ;;
-		3) fancy_message info "Powerline code not coded yet " ;;
+		2) installZSH ;;
+		3) installZSH && installZSHExtras ;;
+		4) installZSH && installOhMyZsh ;; 
+		5) installZSH && installZapPluginManager ;;
 		[mM]) mainMenuType  ;;
 		[qQ]) quitScript  ;;
         *) invalidSection ;;

diff --git a/functions/ubuntu/PPAs/f_Multimedia_PPAs.cfg b/functions/ubuntu/PPAs/f_Multimedia_PPAs.cfg
@@ -2,14 +2,14 @@
 
 #####################################
 
-# July 2022: Still updated
+# Aug 2023: jammy latest branch ... no update for kinetic or lunar
 function installAudioRecorderPPA() {
 	PPATitle="Audio Recorder"
 	PPAName="audio-recorder"
 	PPASource="ppa:audio-recorder/ppa"
 	PPARef="https://launchpad.net/~audio-recorder/+archive/ubuntu/ppa"
 	packageNames="audio-recorder"
-	supportedBases="bionic focal jammy"
+	supportedBases="focal jammy"
 
 	universalAddRepo ${PPATitle} ${PPASource} ${packageNames}
 }
@@ -23,7 +23,7 @@ function installSMPlayerPPA() {
 	PPASource="ppa:rvm/smplayer"
 	PPARef="https://launchpad.net/~rvm/+archive/ubuntu/smplayer/"
 	packageNames="smplayer smplayer-themes smplayer-skins"
-	 supportedBases="bionic focal jammy kinetic"
+	 supportedBases="focal jammy lunar"
 
 	universalAddRepo ${PPATitle} ${PPASource} ${packageNames}
 
@@ -37,7 +37,7 @@ function installMakeMKVPPA() {
 	PPASource="ppa:heyarje/makemkv-beta"
 	PPARef="https://launchpad.net/~heyarje/+archive/ubuntu/makemkv-beta"
 	packageNames="makemkv-bin makemkv-oss"
-	 supportedBases="bionic focal jammy"
+	 supportedBases="focal jammy lunar"
 
 	universalAddRepo ${PPATitle} ${PPASource} ${packageNames}
 
@@ -49,18 +49,18 @@ function installANoisePPA() {
     ppaRef="https://launchpad.net/~costales/+archive/ubuntu/anoise"
     PPASource="ppa:costales/anoise"
     packageNames="anoise anoise-gui"
-	supportedBases="bionic focal jammy kinetic lunar"
+	supportedBases="focal jammy lunar"
 
     universalAddRepo ${PPATitle} ${PPASource} ${packageNames}
 }
 
 function installStrawberryPPA() {
     PPATitle="Strawberry Music Player"
 	PPAName="strawberry"
-    ppaRef="https://launchpad.net/strawberrymusicplayer"
+    ppaRef="https://launchpad.net/~jonaski/+archive/ubuntu/strawberry"
     PPASource="ppa:jonaski/strawberry"
     packageNames="strawberry"
-	supportedBases="bionic focal jammy"
+	supportedBases="focal jammy lunar manic"
 
     universalAddRepo ${PPATitle} ${PPASource} ${packageNames}
 }
diff --git a/functions/ubuntu/PPAs/f_ubuntu_PPAs.cfg b/functions/ubuntu/PPAs/f_ubuntu_PPAs.cfg
@@ -7,7 +7,7 @@ function installLatestLibreOfficePPA() {
 	packageNames="libreoffice"
 	PPASource="ppa:libreoffice/ppa"
     PPARef="https://launchpad.net/~libreoffice/+archive/ubuntu/ppa"
-    supportedBases="bionic focal jammy kinetic lunar"
+    supportedBases="focal jammy lunar"
 
   	universalAddRepo ${PPATitle} ${PPASource} ${packageNames}
 
@@ -25,7 +25,7 @@ function installKubuntuBackportsPPA() {
     packageNames="plasma-desktop"
     PPASource="ppa:kubuntu-ppa/backports"
     PPARef="https://launchpad.net/~kubuntu-ppa/+archive/ubuntu/backports"
-    supportedBases="bionic focal jammy kinetic"
+    supportedBases="focal jammy lunar"
 
   	universalAddRepo ${PPATitle} ${PPASource} ${packageNames}
 
@@ -38,21 +38,20 @@ function installBootRepairPPA() {
     packageNames="boot-repair"
     PPARef="https://launchpad.net/~yannubuntu/+archive/ubuntu/boot-repair"
     PPASource="ppa:yannubuntu/boot-repair"
-    supportedBases="bionic focal jammy kinetic lunar"
+    supportedBases="focal jammy lunar"
 
     universalAddRepo ${PPATitle} ${PPAName} ${PPASOurce}
 
 }
 
-# May 2022: odd ... it supports bionic 18.04 and jammy 22.04 but not focal 20.04 (LTS wise)
-# July 2022: this has Bionic and Jammy but nothing for Focal (20.04) 
+# July 2022: this has jammy but nothing for Focal (20.04) 
 function installGrubCustomizerPPA() {
 	PPATitle="Grub Customizer"
     PPAName="grub-customizer"
     ppaRef="https://launchpad.net/~danielrichter2007/+archive/ubuntu/grub-customizer"
     PPASource="ppa:danielrichter2007/grub-customizer"
     packageNames="grub-customizer"
-    supportedBases="bionic jammy kinetic"
+    supportedBases="jammy"
 
   	universalAddRepo ${PPATitle} ${PPASource} ${packageNames}
 
@@ -66,7 +65,7 @@ function installTeejeePPA() {
 	PPAProgramName="timeshift"
 	PPARef="https://launchpad.net/~teejee2008/+archive/ubuntu/ppa"
 	PPASource="ppa:teejee2008/ppa"
-	supportedBases="bionic focal jammy kinetic lunar"
+	supportedBases="focal jammy lunar"
 
 	universalAddRepo ${PPATitle} ${PPASource} ${packageNames}
 

diff --git a/functions/ubuntu/tic/f_ubuntu_theming.cfg b/functions/ubuntu/tic/f_ubuntu_theming.cfg
@@ -5,13 +5,13 @@
 ## Start of Specific Theme PPAs
 
 # May 2022: has Focal Support, so this is still updated
-# May 2023: not updated since 2020 and bionic support dropping soon 
+# May 2023: not updated since 2020
 function plataThemePPA() {
     # https://gitlab.com/tista500/plata-theme
     ppaTitle="Plata-Theme"
     ppaRef="https://launchpad.net/~tista/+archive/ubuntu/plata-theme"
     PPASource="ppa:tista/plata-theme"
-    supportedBases="bionic focal"
+    supportedBases="focal"
     packageNames="plate-theme"
 
     universalAddRepo ${PPATitle} ${PPASource} ${packageNames}
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,8 +30,8 @@ function gtkVersionDetection() { @@
     # 	 esac
-    	gtkVersion=$(inxi -Sxx | awk '/GTK/ {print $10}')
+    	# late Aug 2023 idea
+    	gtkVersion=$(gtk-launch --version)
     }
@@ Expand Down @@