Merge pull request #21 from bashpack-project/main

3.0.1

Author: ggtrd

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 The released versions changelogs below are only about the main repository.
 
+### *3.0.1*
+*2025/02/23*
+
+##### Modified
+- Builtin subcommand "verify" splitted in "--verify-*" options
+
+##### Fixed
+- Automatic completion creation
+- Using -i option from an already installed CLI could cause an error saying both source and destination are same files
+
+------------
 ### 3.0.0
 *2025/02/21*
 
@@ -11,7 +22,7 @@ The released versions changelogs below are only about the main repository.
 - Anyone can now host a repository for its own CLI (edit cli_url option from the configuration file)
 - Repositories are compatibles with Github, but can also be simple directories listing web servers
 - Documentation website at https://bashpack-project.github.io
-- Subcommand template is available with the option "-n'
+- Subcommand template is available with the option "-n"
 
 ##### Modified
 - The CLI has been redesigned has a "script manager", to download/install/run/remove scripts as subcommands

bashpack.sh

@@ -30,7 +30,7 @@
 
 
 
-export VERSION="3.0.0"
+export VERSION="3.0.1"
 
 export NAME="Bashpack"
 export NAME_LOWERCASE="$(echo "$NAME" | tr A-Z a-z)"
@@ -179,53 +179,25 @@ if [ -z "$1" ]; then
 else
 	case "$1" in
 		-v|--version) echo $VERSION && exit ;;
-		# command)
-		# 	case "$2" in
-		# 		--help) echo "$USAGE" \
-		# 		&&		echo "" \
-		# 		&&		echo "Manage $NAME sub commands." \
-		# 		&&		echo "" \
-		# 		&&		echo "Options:" \
-		# 		&&		echo " -l, --list         list available commands." \
-		# 		&&		echo " -g, --get <name>   install a command." \
-		# 		&&		echo " -d, --delete       remove a command." \
-		# 		&&		echo "" \
-		# 		&&		echo "$NAME $VERSION" \
-		# 		&&		exit ;;
-		# 	esac
-		# ;;
-		verify)
-			case "$2" in
-				--help) echo "$USAGE" \
-				&&		echo "" \
-				&&		echo "Verify current $NAME installation health." \
-				&&		echo "" \
-				&&		echo "Options:" \
-				&&		echo " -f, --files                  check that all required files are available." \
-				&&		echo " -d, --dependencies <file>    check that required dependencies are available." \
-				&&		echo " -r, --repository             check that remote repository is reachable." \
-				&&		echo "" \
-				&&		echo "$NAME $VERSION" \
-				&&		exit ;;
-			esac
-		;;
 		-h|--help|help) echo "$USAGE" \
 		&&		echo "" \
 		&&		echo "Options:" \
-		&&		echo " -i, --self-install   install (or reinstall) $NAME on your system as the command '$NAME_ALIAS'." \
-		&&		echo " -u, --self-update    update $NAME to the latest available version (--force option available)." \
-		&&		echo "     --self-delete    delete $NAME from your system." \
-		&&		echo "     --logs           display logs." \
-		&&		echo " -h, --help           display this information." \
-		&&		echo " -v, --version        display version." \
-		&&		echo " -l, --list           list available subcommands (local and remote). " \
-		&&		echo " -g, --get <name>     install a subcommand." \
-		&&		echo " -n, --new <name>		get a template to create a subcommand." \
-		&&		echo " -d, --delete <name>  uninstall a subcommand." \
+		&&		echo " -i, --self-install                  install (or reinstall) $NAME on your system as the command '$NAME_ALIAS'." \
+		&&		echo " -u, --self-update                   update $NAME to the latest available version (--force option available)." \
+		&&		echo "     --self-delete                   delete $NAME from your system." \
+		&&		echo " -l, --list <local>                  list available subcommands (local and remote). " \
+		&&		echo " -g, --get <name>                    install a subcommand." \
+		&&		echo " -n, --new <name>                    get a template to create a subcommand." \
+		&&		echo " -d, --delete <name>                 uninstall a subcommand." \
+		&&		echo "     --verify-files                  check that all required files are available." \
+		&&		echo "     --verify-dependencies <file>    check that required dependencies are available." \
+		&&		echo "     --verify-repository             check that remote repository is reachable." \
+		&&		echo "     --logs                          display logs." \
+		&&		echo " -h, --help                          display this information." \
+		&&		echo " -v, --version                       display version." \
 		&&		echo "" \
 		&&		echo "Commands (<command> --help to display usages):" \
-		&&		echo "  verify" \
-		&&		echo "$(ls $dir_commands 2> /dev/null | sed "s/^/  /g")" \
+		&&		echo "$(ls $dir_commands 2> /dev/null | sed 's|\..*||' | sed 's|^|  |')" \
 		&&		echo "\n$NAME $VERSION" \
 		&&		exit ;;
 	esac
@@ -815,23 +787,33 @@ fi
 # Usage: create_completion <file_command>
 create_completion() {
 
-	local file_command="$1"
-	local command="$(echo $(basename $file_command))"
+	local command="$1"
+	# local file_command="$(echo $(basename $command))"
+	# local file_command="$(echo $(basename $command.sh))"
+	local file_command="$command.sh"
 
+	local dir_commands="$dir_src_cli/commands"
 
+
+	# echo file_command $file_command
+	# echo command $command
+	
 	# List all options of any file that is a CLI
 	# Usage: get_options <file path>
 	get_options() {
-		cat $1 | sed 's/.*[ \t|]\(.*\)).*/\1/' | grep '^\-\-' | sort -ud | sed -Ez 's/([^\n])\n/\1 /g'
+		cat $1 | grep '\--.*)' | sed 's/\t*//' | sed 's/).*//' | sed 's/.*|//' | grep '^-' | sort -ud
 	}
 
 
+
 	if [ "$(exists_command "pkg-config")" = "exists" ]; then
 
 		# Install completion only if the directory has been found.
 		if [ -d "$dir_completion" ]; then
 
-				if [ "$file_command" = "$CURRENT_CLI" ]; then
+			# if [ "$file_command" = "$CURRENT_CLI" ]; then
+			# if [ "$file_command" = "$NAME_LOWERCASE.sh" ]; then
+			if [ "$(echo $file_command | grep $NAME_LOWERCASE)" ]; then
 
 				if [ -f "$file_completion" ]; then
 					rm -f $file_completion
@@ -870,16 +852,18 @@ create_completion() {
 				# Duplicate the line and make it unique with the "new" word to find and replace it with automatics values
 				sed -i 's|\(_commandtofill.*\)|\1\n\1new|' $file_completion
 				sed -i "s|_commandtofill\(.*new\).*|\t\t\t$command\1|" $file_completion
-				sed -i "s|_optionstofill\(.*\)new|$(get_options $dir_commands/$file_command)\1|" $file_completion
+				sed -i "s|_optionstofill\(.*\)new|$(echo $(get_options $dir_commands/$file_command))\1|" $file_completion
+				# sed -i "s|_optionstofill\(.*\)new|$(echo $(get_options $dir_src_cli/commands/$file_command))\1|" $file_completion
 
 				# Add the subcommand itself to the completion
 				sed -i "s|\(1) COMPREPLY.*\)\"|\1 $command\"|" $file_completion
 			fi
 
+
 			if [ -f "$file_completion" ] && [ -f "$file_completion_alias_1" ] && [ -f "$file_completion_alias_2" ]; then
-				log_info "completion ready."
+				log_info "completion of '$command' ready."
 			else
-				log_error "completion not ready."
+				log_error "completion of '$command' not ready."
 			fi
 
 		else
@@ -2118,19 +2102,20 @@ install_cli() {
 
 		# Depending on what version an update is performed, it can happen that cp can't overwrite a previous symlink
 		# Remove them to allow installation of the CLI
-		if [ -f "$file_main_alias_1" ] || [ -f "$file_main_alias_2" ]; then
-			rm -f $file_main_alias_1
-			if [ ! -f "$file_main_alias_1" ]; then
-				log_info "file '$file_main_alias_1' removed."
-			fi
+		if [ "$(echo $CURRENT_CLI | grep $NAME_LOWERCASE.sh)" ]; then
+			if [ -f "$file_main_alias_1" ] || [ -f "$file_main_alias_2" ]; then
+				rm -f $file_main_alias_1
+				if [ ! -f "$file_main_alias_1" ]; then
+					log_info "file '$file_main_alias_1' removed."
+				fi
 
-			rm -f $file_main_alias_2
-			if [ ! -f "$file_main_alias_2" ]; then
-				log_info "file '$file_main_alias_2' removed."
+				rm -f $file_main_alias_2
+				if [ ! -f "$file_main_alias_2" ]; then
+					log_info "file '$file_main_alias_2' removed."
+				fi
 			fi
 		fi
 
-
 		# Sources files installation
 		if [ ! -d "$dir_src_cli" ]; then
 			log_info "$dir_src_cli not found, creating it."
@@ -2160,7 +2145,13 @@ install_cli() {
 
 		# Or do the basic offline installation
 		else
-			cp -f $CURRENT_CLI $file_main
+			# Avoid non copy file in case of installing from current installed CLI (because an error will be raised saying source and destination are same files)
+			if [ "$(cat $CURRENT_CLI)" != "$(cat $file_main)" ]; then
+				cp -f $CURRENT_CLI $file_main
+
+				# Autocompletion installation
+				create_completion $CURRENT_CLI
+			fi
 		fi
 
 		if [ -f "$file_main" ]; then
@@ -2184,24 +2175,18 @@ install_cli() {
 		echo "$(cat $CURRENT_CLI | grep -A 21 "MIT License" | head -n 21)" > "$dir_src_cli/LICENSE.md"
 
 
-		# Autocompletion installation
-		create_completion $CURRENT_CLI
-
-
 		# Delete all automations because some of them might have changed
 		# if [ "$(ls $dir_systemd/$NAME_LOWERCASE*)" ]; then
 		if [ "$(ls $dir_systemd/$NAME_LOWERCASE*)" ]; then
 			rm -f $dir_systemd/$NAME_LOWERCASE*
 		fi
 
 		# Reinstall all automations and completion of the subcommands
+		local dir_commands="$dir_src_cli/commands"		# Force using the $dir_command of the installed CLI to avoid the local installed subcommands
 		if [ -d "$dir_commands" ]; then
 			if [ "$(ls $dir_commands)" ]; then
 				for command in $dir_commands/*; do
 
-					# echo $command
-					# echo $dir_commands/$command
-
 					local command_name="$(echo $command | sed 's|^.*/\(.*\)\..*|\1|')"
 
 					# Ensure the command needs to be initialized
@@ -2280,21 +2265,11 @@ case "$1" in
 	--logs)							get_logs "$file_log_main" ;;
 	-l|--list)						loading_process "subcommand_list $2" ;;
 	-g|--get)						loading_process "subcommand_get $2" ;;
-	# -g|--get)						loading_process "subcommand_update $2" ;;
 	-d|--delete)					subcommand_delete $2 $3 ;;
 	-n|--new)						subcommand_new $2 $3 ;;
-	verify)
-		if [ -z "$2" ]; then
-									loading_process "verify_dependencies $3";  loading_process "verify_files"; loading_process "verify_repository_reachability $(match_url_repository $(get_config_value $file_config cli_url) github_raw)"
-		else
-			case "$2" in
-				-f|--files)			loading_process "verify_files $3" ;;
-				-d|--dependencies)	loading_process "verify_dependencies $3" ;;
-				# -r|--repository)	loading_process "verify_repository_reachability "$URL_RAW/main/$NAME_LOWERCASE.sh""; loading_process "verify_repository_reachability "$URL_API/tarball/$VERSION"" ;;
-				-r|--repository)	loading_process "verify_repository_reachability $(match_url_repository $(get_config_value $file_config cli_url) github_raw)" ;;
-				*)					log_error "unknown option [$1] '$2'." && echo "$USAGE" && exit ;;
-			esac
-		fi ;;
+	--verify-files)					loading_process "verify_files $3" ;;
+	--verify-dependencies)			loading_process "verify_dependencies $3" ;;
+	--verify-repository)			loading_process "verify_repository_reachability $(match_url_repository $(get_config_value $file_config cli_url) github_raw)" ;;
 	# 'self' is a word used in many operations for the CLI, it's preferable to not allow it in subcommand name
 	self)							log_error "reserved operation." && exit ;;
 	# Since "export -f" is not available in Shell, the helper command below permits to use commands from this file in sub scripts