From f9a7cc57ac443daf31098445c9b5720aed06cee0 Mon Sep 17 00:00:00 2001 From: pyr0ball Date: Fri, 11 Aug 2023 01:11:40 -0700 Subject: [PATCH 1/3] fixed formatting issues in quickinfo --- extras/Slipstream.install | 3 +++ install.sh | 2 +- lib/skel/.bashrc.d/11-quickinfo.bashrc | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/extras/Slipstream.install b/extras/Slipstream.install index 811134b..4b6c938 100755 --- a/extras/Slipstream.install +++ b/extras/Slipstream.install @@ -36,6 +36,9 @@ sys_packages=( curl python3 python3-pip + cmake + libgmp3-dev + libgtk-3-dev ) pip_packages=( diff --git a/install.sh b/install.sh index 939797e..3f5f64c 100755 --- a/install.sh +++ b/install.sh @@ -56,7 +56,7 @@ globalinstalldir="/usr/share/prbl" # Initialize arrays for file and dependency management bins_missing=() -backupFiles=() +backup_files=() installed_files=() installed_dirs=() diff --git a/lib/skel/.bashrc.d/11-quickinfo.bashrc b/lib/skel/.bashrc.d/11-quickinfo.bashrc index 3538ac5..ce8d11b 100755 --- a/lib/skel/.bashrc.d/11-quickinfo.bashrc +++ b/lib/skel/.bashrc.d/11-quickinfo.bashrc @@ -246,7 +246,7 @@ fi # Check for release upgrade if [ -x /usr/lib/ubuntu-release-upgrader/release-upgrade-motd ]; then if [ -f /var/lib/ubuntu-release-upgrader/release-upgrade-available ] ; then - release_upgrade=$(cat /var/lib/ubuntu-release-upgrader/release-upgrade-available) + release_upgrade="$(cat /var/lib/ubuntu-release-upgrader/release-upgrade-available)" fi fi if [ "$(lsb_release -sd | cut -d ' ' -f4)" = "(development" ]; then @@ -257,7 +257,7 @@ fi # Check for fsck message if [ -x /usr/lib/update-notifier/update-motd-fsck-at-reboot ]; then - fsck_needed=`exec /usr/lib/update-notifier/update-motd-fsck-at-reboot` + fsck_needed="$(exec /usr/lib/update-notifier/update-motd-fsck-at-reboot)" fi ################################ @@ -327,10 +327,10 @@ boxline "" for((i=0; i<"${#adapters[@]}"; i++ )); do if [[ $show_disconnected != true ]] ; then if [[ ${ifups[$i]} == up ]] ; then - boxline " ${adapters[$i]}: ${cyn}${ips[$i]}${dfl}\t| ${blu}${macs[$i]}${dfl}" + boxline " ${adapters[$i]}: ${cyn}${ips[$i]}${dfl} | ${blu}${macs[$i]}${dfl}" fi else - boxline " ${adapters[$i]}: ${cyn}${ips[$i]}${dfl}\t| ${blu}${macs[$i]}${dfl}" + boxline " ${adapters[$i]}: ${cyn}${ips[$i]}${dfl} | ${blu}${macs[$i]}${dfl}" fi done boxline " WAN IP: ${ylw}${wan_ip}${dfl}" @@ -345,7 +345,7 @@ boxline " Memory used/total: ${mem_usage}" boxline " ${unl}Disk Info:${dfl}" boxline "${unl}$(printf '\t|%-4s\t%-4s\t%-4s\t%-4s\n' Usage Free Mount Volumes)${dfl}" for((i=0; i<"${#logicals[@]}"; i++ )); do - boxline "\t$(printf '|%-4s\t%-4s\t%-4s\t%-4s\n' ${usages[$i]} ${freespaces[$i]} ${mounts[$i]} ${logicals[$i]})" + boxline " $(printf '|%-4s\t%-4s\t%-4s\t%-4s\n' ${usages[$i]} ${freespaces[$i]} ${mounts[$i]} ${logicals[$i]})" done boxline "" if [[ "$need_updates" == "true" ]] ; then From 5c0ec6c90fc7c62a66912d7d3019beee9c11d8d0 Mon Sep 17 00:00:00 2001 From: pyr0ball Date: Fri, 11 Aug 2023 01:12:38 -0700 Subject: [PATCH 2/3] iterated minor version 2.3.5 - fixed Slipstream dependencies --- PRbL | 2 +- extras/Slipstream.install | 3 ++- install.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PRbL b/PRbL index 2fac6ba..396430c 160000 --- a/PRbL +++ b/PRbL @@ -1 +1 @@ -Subproject commit 2fac6ba3a335a89acc07287928446bd6b92169d1 +Subproject commit 396430c539486520f444fa3c6afb89e91c0dbbc8 diff --git a/extras/Slipstream.install b/extras/Slipstream.install index 4b6c938..d85c7d7 100755 --- a/extras/Slipstream.install +++ b/extras/Slipstream.install @@ -42,7 +42,8 @@ sys_packages=( ) pip_packages=( - pyparsing + pyparsing==3.0.9 + gitpython ) repo_packages=( diff --git a/install.sh b/install.sh index 3f5f64c..278454d 100755 --- a/install.sh +++ b/install.sh @@ -4,7 +4,7 @@ ################################################################### # initial vars -VERSION=2.3.4 +VERSION=2.3.5 scripttitle="Pyr0ball's Reductive Bash Library Installer - v$VERSION" # Bash expansions to get the name and location of this script when run From 8b370797f215268f5526d0d612a29b32b468a113 Mon Sep 17 00:00:00 2001 From: pyr0ball Date: Fri, 11 Aug 2023 01:31:19 -0700 Subject: [PATCH 3/3] fixed syntax error --- lib/skel/.bashrc.d/11-quickinfo.bashrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/skel/.bashrc.d/11-quickinfo.bashrc b/lib/skel/.bashrc.d/11-quickinfo.bashrc index ce8d11b..8d61750 100755 --- a/lib/skel/.bashrc.d/11-quickinfo.bashrc +++ b/lib/skel/.bashrc.d/11-quickinfo.bashrc @@ -10,7 +10,7 @@ ############################################################### quickinfo_version=2.1.0 -prbl_functons_req_ver=1.1.3 +prbl_functons_req_ver=1.6.0 # Uses a wide variety of methods to check which distro this is run on # TODO: Add alternative handling for other environments @@ -178,7 +178,7 @@ fi # TODO: optimize this to run after time delay using timestamp in settings set_spinner spinner19 #spin "eval $(wan_ip=$(wget -qO- http://ipecho.net/plain \| xargs echo ))" -read -r wan_ip < <(wget -qO- http://ipecho.net/plain \| xargs echo) +spin read -r wan_ip < <(wget -qO- https://ident.me/) # Checks memory usage mem_usage=$(free -m | grep Mem | awk '{print $3"M/"$2"M"}') @@ -324,7 +324,7 @@ boxline "" boxline "${bld}${unl}Location:${dfl} ${grn}${unl}$location${dfl}" boxline "" # Echo out network arrays -for((i=0; i<"${#adapters[@]}"; i++ )); do +for ((i=0; i<"${#adapters[@]}"; i++ )); do if [[ $show_disconnected != true ]] ; then if [[ ${ifups[$i]} == up ]] ; then boxline " ${adapters[$i]}: ${cyn}${ips[$i]}${dfl} | ${blu}${macs[$i]}${dfl}" @@ -355,6 +355,6 @@ if [[ "$need_updates" == "true" ]] ; then boxline " ${release_upgrade}" fi if [ -z "${fsck_needed}" ] || [ -z "${reboot_required}" ] ; then - boxline " ${fsck_needed}${reboot_required}" + boxline " ${fsck_needed} ${reboot_required} " fi boxbottom