Merge pull request #48 from Utappia/develop

Prep .8 release
Utappia · May 8, 2024 · c156224 · c156224
2 parents 3aaae0d + 40b1377
commit c156224
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -12,8 +12,8 @@
 	License: GPL3 (http://www.gnu.org/licenses/gpl.html)
 	Author : Salih Emin
 	Email  : salih-(a)-utappia.org
-	Date   : 01-05-2024 (first release 19-02-2009)
-	Version: 24.05.0
+	Date   : 08-05-2024 (first release 19-02-2009)
+	Version: 24.05.8
 	System : Ubuntu Linux and derivatives. With Deb, Snap or Flatpak. (Partial support for Debian and WSL2) 
 	WebSite: http://utappia.org
 

diff --git a/ucaresystem-core b/ucaresystem-core
@@ -10,8 +10,8 @@ set -e
 # Author : Salih Emin
 # WebSite: http://utappia.org
 # Email  : salih-(at)-utappia.org
-# Date   : 01-05-2024 (first release 19-02-2009)
-# Version: 24.05.0
+# Date   : 08-05-2024 (first release 19-02-2009)
+# Version: 24.05.8
 # System : Ubuntu Linux and derivatives. With Deb, Snap or Flatpak. (Partial support for Debian and WSL2) 
 # Description:
 #This simple script will automatically refresh your package list, download and install
@@ -73,14 +73,6 @@ function WELCOME_SCREEN {
 	echo "                                                       "
 	echo " Welcome to all-in-one System Update and maintenance   "
 	echo " assistant app.                                        "
-	echo "                                                       "
-	echo "                                                       "
-	echo " This simple script will automatically         	     "
-	echo " refresh your packagelist, download and                "
-	echo " install updates (if there are any), remove any old    "
-	echo " kernels, obsolete packages and configuration files    "
-	echo " to free up disk space, without any need of user       "
-	echo " interference                                          "
 	echo "                   				                     "
 	echo " If you've found it helpful and it has saved you time	 "
 	echo " please consider supporting its development with a     "
@@ -97,7 +89,7 @@ function WELCOME_SCREEN {
 	COUNTDOWN $duration
 }
 
-function MAINTENACE {
+function MAINTENANCE {
 	echo
 	echo
 	echo "#########################"
@@ -412,11 +404,11 @@ function GOODBYE {
 	echo " that I have put into it.                              "
 	echo "                                                       "
 	echo "           https://www.paypal.me/cerebrux              "
+	echo "												     	 "
+	echo "												     	 "
+	echo "     		All maintenace Complete... GOODBYE			 "
 	echo "_______________________________________________________"
 	echo
-	echo "#########################"
-	echo "     All Done... GOODBYE"
-	echo "#########################"
 }
 
 function SHUT_DOWN {
@@ -427,7 +419,7 @@ function SHUT_DOWN {
 	echo "Shutting down as you requested"
 	echo "##############################"
 	echo
-	MESSAGE="uCareSystem will shutdown your system"
+	MESSAGE="Shuting down"
 	COUNTDOWN $duration
 	sudo shutdown now
 }
@@ -440,7 +432,7 @@ function RE_BOOT {
 	echo "Rebooting as you requested"
 	echo "##########################"
 	echo
-	MESSAGE="uCareSystem will reboot your system"
+	MESSAGE="Rebooting"
 	COUNTDOWN $duration
 	sudo reboot
 	## End of script
@@ -449,10 +441,10 @@ function RE_BOOT {
 # The main process starts
 while [ "$1" != "" ]; do
     case $1 in
-        -u | --upgrade )     WELCOME_SCREEN && MAINTENACE && UPGRADE_TO_NEXT_RELEASE
+        -u | --upgrade )     WELCOME_SCREEN && MAINTENANCE && UPGRADE_TO_NEXT_RELEASE
                              exit
                                 ;;
-        -d | --development ) WELCOME_SCREEN && MAINTENACE && UPGRADE_TO_DEVEL_RELEASE
+        -d | --development ) WELCOME_SCREEN && MAINTENANCE && UPGRADE_TO_DEVEL_RELEASE
                              exit
                                 ;;
         -h | --help )        SHOW_HELP
@@ -461,15 +453,15 @@ while [ "$1" != "" ]; do
         -eol | --end-of-life-upgrade ) UPGRADE_EOL_TO_NEXT
                              exit
                                 ;;
-	-s | --shutdown )	 WELCOME_SCREEN && MAINTENACE && GOODBYE && SHUT_DOWN
+	-s | --shutdown )	 WELCOME_SCREEN && MAINTENANCE && GOODBYE && SHUT_DOWN
 							 exit
 							    ;;
-	-r | --reboot )		 WELCOME_SCREEN && MAINTENACE && GOODBYE && RE_BOOT
+	-r | --reboot )		 WELCOME_SCREEN && MAINTENANCE && GOODBYE && RE_BOOT
 							 exit
 							    ;;
         * )                  SHOW_HELP
                              exit 1
     esac
 done
 ## If no parameter is given just do the regular maintenance
-WELCOME_SCREEN && MAINTENACE && GOODBYE
+WELCOME_SCREEN && MAINTENANCE && GOODBYE