Merge pull request #12 from bashpack-project/working

0.2.24

Author: ggtrd

README.md

@@ -5,28 +5,29 @@ Bashpack is a **user-friendly Linux toolbox**.
 It has been designed for helping **Linux** users on their **day to day tasks**.
 It can also be useful for IT teams who needs to ensure security on their Linux park.
 
-You can easily setup automations with the differents options.
+You can easily setup **automations** with the differents **options**.
 
 <br>
 
 ## Features
 * (available)    Unified Linux updates ([APT](https://fr.wikipedia.org/wiki/Advanced_Packaging_Tool) and [Snapcraft](https://snapcraft.io/) packages (Snapcraft is not installed with this script, it just handled if already used)).
 * (incoming)     Unified Linux updates (firmwares with [fwupd](https://github.com/fwupd/fwupd)).
-* (incoming)     Linux firewall security (close ports with [nftables](https://wiki.nftables.org/wiki-nftables/index.php/Main_Page) ([Docker](https://www.docker.com/) compatible)).
+* (incoming)     Secure Linux firewall (close ports with [nftables](https://wiki.nftables.org/wiki-nftables/index.php/Main_Page) ([Docker](https://www.docker.com/) compatible)).
 * (incoming)     Routes over VPN to one or many points ([OpenVPN](https://openvpn.net/) compatible).
 
 <br>
 
 ## Quick start
 Copy/paste the following command blocks on your Linux terminal to manage your Bashpack installation.
 * _You must be sudo._
-* _Once installed, Bashpack will automatically update itself (it checks for updates once a day)._
+* _Once installed, Bashpack will automatically update itself once a day ([Systemd](https://systemd.io/) installations **only**)._
 
 **Install**
 ```javascript
 curl -sL https://raw.githubusercontent.com/bashpack-project/bashpack/main/bashpack.sh -o bashpack.sh \
  && chmod +x bashpack.sh \
- && sudo ./bashpack.sh -i
+ && sudo ./bashpack.sh -i \
+ && rm bashpack.sh
 ```
 
 **Update**
@@ -46,30 +47,29 @@ sudo bp --self-delete
 ```javascript
 bp --help
 ```
-<br>
-
-**Builtin automations** are automatically configured with [Systemd](https://systemd.io/) on your system.
 
 <br>
 
+
 ### Unified Linux updates
-Launch an automatic update of everything on your system:
+Launch a pre-validated update of everything on your system:
 ```javascript
 sudo bp update -y
 ```
-Check next update:
+
+Check next update ([Systemd](https://systemd.io/) installations **only**):
 ```javascript
 sudo bp update --when
 ```
-Get logs from last update:
+Get logs from last update ([Systemd](https://systemd.io/) installations **only**):
 ```javascript
 sudo bp update --get-logs
 ```
 
 <br>
 
 
-### Linux firewall security
+### Secure Linux firewall
 Incoming
 
 <br>
@@ -78,4 +78,4 @@ Incoming
 ### Routes over VPN
 Incoming
 
-<br>
+<br>

bash_completion

@@ -27,10 +27,10 @@ _bashpack() {
   local prev=${COMP_WORDS[COMP_CWORD-1]}
 
   case ${COMP_CWORD} in
-    1) COMPREPLY=($(compgen -W "update man --get-logs --version --help --self-install --self-update --self-delete" -- ${cur})) ;;
+    1) COMPREPLY=($(compgen -W "update man --version --help --self-install --self-update --self-delete" -- ${cur})) ;;
     2)
       case ${prev} in
-        update) COMPREPLY=($(compgen -W "--help --assume-yes --ask --when" -- ${cur})) ;;
+        update) COMPREPLY=($(compgen -W "--help --assume-yes --ask --when --get-logs" -- ${cur})) ;;
       esac ;;
     *) COMPREPLY=() ;;
   esac

bashpack.sh

@@ -24,11 +24,9 @@
 
 
 
-#URL="http://localhost"													# for local web server							
-URL="https://api.github.com/repos/bashpack-project/bashpack/tarball"	# for Github tarball
-# URL="https://github.com/bashpack-project/bashpack/archive/refs/heads"	# for Github main branch
+URL="https://api.github.com/repos/bashpack-project/bashpack/tarball"	# Github latest tarball
 
-VERSION="0.2.23"
+VERSION="0.2.24"
 
 NAME="Bashpack"
 NAME_LOWERCASE=$(echo "$NAME" | tr A-Z a-z)
@@ -71,32 +69,18 @@ else
 		;;
 		--help) echo "$USAGE" \
 		&&		echo "" \
-		&&		echo "$NAME is a user-friendly Linux toolbox." \
-		&&		echo "It has been designed for helping Linux users on their day to day tasks." \
-		&&		echo "It can also be useful for IT teams who needs to ensure security on their Linux park." \
-		&&		echo "You can easily setup automations with the differents options." \
-		&&		echo "" \
-		&&		echo "Features:" \
-		&&		echo " (available)	Unified Linux updates (packages)." \
-		&&		echo " (incoming)	Unified Linux updates (firmwares)." \
-		&&		echo " (incoming)	Linux firewall security (close ports with nftables - Docker compatible)." \
-		&&		echo " (incoming)	Routes over VPN to one or many points (OpenVPN compatible)." \
-		&&		echo "" \
-		&&		echo "" \
 		&&		echo "Options:" \
 		&&		echo " -i, --self-install	install (or reinstall) $NAME on your system as the command '$NAME_ALIAS'." \
 		&&		echo " -u, --self-update	update your current $NAME installation to the latest available version." \
 		&&		echo "     --self-delete	delete $NAME from your system." \
 		&&		echo "     --help   		display this information." \
 		&&		echo "     --version		display version." \
 		&&		echo "" \
-		&&		echo "" \
 		&&		echo "Commands:" \
 		&&		echo " update [OPTION]	use '$NAME_ALIAS update --help' for the command options." \
 		&&		echo "" \
 		&&		echo "" \
-		&&		echo "Written in Bash, and it's a pack." \
-		&&		echo "Version $VERSION" \
+		&&		echo "$NAME $VERSION" \
 		&&		exit ;;
 	esac
 fi
@@ -331,14 +315,11 @@ archive_extract() {
 
 # Download releases archives from the repository
 # Usages:
-# - download_cli <latest>
-# - download_cli <n.n.n>
+# - download_cli <url of latest>
+# - download_cli <url of n.n.n>
 download_cli() {
 
-	#local archive_name="$NAME_LOWERCASE-${1}.tar.gz"	# for basic web server
-	#local archive_url="$URL/$archive_name"				# for basic web server
-	local archive_url=${1}								# for Github taball
-
+	local archive_url=${1}
 
 	# Prepare tmp directory
 	rm -rf $archive_dir_tmp
@@ -464,8 +445,6 @@ create_cli() {
 
 
 		# Clear temporary files & directories
-		# rm -f $archive_tmp
-		# rm -rf $archive_dir_tmp
 		rm -rf $dir_tmp/$NAME_LOWERCASE*		# Cleaning also temp files created during update process since create_cli is not called directly during update.
 
 
@@ -494,15 +473,10 @@ update_cli() {
 	# Download a first time the latest version from the "main" branch to be able to launch the installation script from it to get latest modifications.
 	# Ths install function will download the well-named archive with the version name
 	# (so yes, it means that the CLI is downloaded twice)
-	
-	#download_cli "main"									# Github main branch
-	#download_cli "main" 2>&1 > /dev/null					# Github main branch
-	#download_cli "$URL" 2>&1 > /dev/null					# Github latest tarball
-	download_cli "$URL"										# Github latest tarball
+	download_cli "$URL"
 
 	# Delete current installed version to clean all old files
 	delete_all exclude_main
-	#delete_systemd && delete_cli exclude_main
 
 	echo ""
 
@@ -524,8 +498,7 @@ update_cli() {
 install_cli() {
 	detect_cli
 
-	download_cli "$URL/$VERSION"		# Github latest tarball
-	#download_cli $VERSION				# Github main branch
+	download_cli "$URL/$VERSION"
 
 	create_cli
 }