Loads of UI improvements and fixes

still lots of testing to do

lgsm/functions/command_mods_remove.sh

@@ -19,7 +19,6 @@ fn_mods_remove_init(){
 	# A simple function to exit if no mods were installed
 	# Also returns ${installedmodscount} if mods were found
 	fn_mods_exit_if_not_installed
-	echo ""
 	# Displays installed addons to the user
 	fn_installed_mods_medium_list
 	echo ""
@@ -35,7 +34,7 @@ fn_mods_remove_init(){
 			fn_print_error2_nl "${usermodselect} is not a valid addon/mod."
 		fi
 	done
-	fn_print_warning_nl "You are about to remove ${usermodselect}."
+	fn_print_warning_nl "You are about to remove ${cyan}${usermodselect}${default}."
 	echo " * Any custom files/configuration will be removed."
 	while true; do
 		read -e -i "y" -p "Continue? [Y/n]" yn
@@ -50,34 +49,71 @@ fn_mods_remove_init(){
 	fn_mod_get_info_from_command
 	# Check file list in order to make sure we're able to remove the mod (returns ${modsfilelistsize})
 	fn_check_files_list
-	fn_script_log "Removing ${modsfilelistsize} files from ${modprettyname}"
-	fn_print_dots "Removing ${modsfilelistsize} files from ${modprettyname}"
+
 }
 
 # Uninstall the mod
 fn_mod_remove_process(){
+	fn_script_log "Removing ${modsfilelistsize} files from ${modprettyname}"
+	echo -e "removing ${modprettyname}"
+	echo -e "* ${modsfilelistsize} files to be removed"
+	echo -e "* location: ${modinstalldir}"
+	sleep 1
 	# Go through every file and remove it
 	modfileline="1"
+	tput sc
 	while [ "${modfileline}" -le "${modsfilelistsize}" ]; do
 		# Current line defines current file to remove
 		currentfileremove="$(sed "${modfileline}q;d" "${modsdatadir}/${modcommand}-files.txt")"
 		# If file or directory exists, then remove it
-		if [ -f "${modinstalldir}/${currentfileremove}" ]||[ -d "${modinstalldir}/${currentfileremove}" ]; then
 		fn_script_log "Removing: ${modinstalldir}/${currentfileremove}"
+		if [ -f "${modinstalldir}/${currentfileremove}" ]||[ -d "${modinstalldir}/${currentfileremove}" ]; then
 			rm -rf "${modinstalldir}/${currentfileremove}"
+			local exitcode=$?
 		fi
+		tput rc; tput el
+		printf  "removing ${modprettyname} ${totalfileswc} / ${modsfilelistsize} : ${currentfileremove}..."
+
+		((totalfileswc++))
 		let modfileline=modfileline+1
 	done
+	tput rc; tput ed;
+	echo -ne "removing ${modprettyname} ${totalfileswc} / ${modsfilelistsize}..."
+	if [ ${exitcode} -ne 0 ]; then
+		fn_print_fail_eol_nl
+		core_exit.sh
+	else
+		fn_print_ok_eol_nl
+	fi
+	sleep 0.5
 	# Remove file list
+	echo -en "removing ${modcommand}-files.txt..."
+	sleep 0.5
 	fn_script_log "Removing: ${modsdatadir}/${modcommand}-files.txt"
 	rm -rf "${modsdatadir}/${modcommand}-files.txt"
+	local exitcode=$?
+	if [ ${exitcode} -ne 0 ]; then
+		fn_print_fail_eol_nl
+		core_exit.sh
+	else
+		fn_print_ok_eol_nl
+	fi
 	# Remove from installed mods list
+	echo -en "removing ${modcommand} from ${modslockfile}..."
+	sleep 0.5
 	fn_script_log "Removing: ${modcommand} from ${modslockfilefullpath}"
 	sed -i "/^${modcommand}$/d" "${modslockfilefullpath}"
 	# Post install tasks to solve potential issues
+	local exitcode=$?
+	if [ ${exitcode} -ne 0 ]; then
+		fn_print_fail_eol_nl
+		core_exit.sh
+	else
+		fn_print_ok_eol_nl
+	fi
 	fn_postuninstall_tasks
-	fn_print_ok_nl "Removed ${modprettyname}"
-	fn_script_log "Removed ${modprettyname}"
+	echo "${modprettyname} removed"
+	fn_script_log "${modprettyname} removed"
 }
 
 fn_mods_remove_init

lgsm/functions/mods_core.sh

@@ -93,20 +93,22 @@ fn_mod_lowercase(){
 		fn_script_log "Converting ${modprettyname} files to lowercase"
 		files=$(find "${extractdir}" -depth | wc -l)
 		echo -en "\r"
-		while read SRC; do
-		    DST=`dirname "${SRC}"`/`basename "${SRC}" | tr '[A-Z]' '[a-z]'`
-		    if [ "${SRC}" != "${DST}" ]
+		while read src; do
+			dst=`dirname "${src}"`/`basename "${src}" | tr '[A-Z]' '[a-z]'`
+			if [ "${src}" != "${dst}" ]
 			then
-		        [ ! -e "${DST}" ] && mv -T "${SRC}" "${DST}" || echo "${SRC} was not renamed"
+				[ ! -e "${dst}" ] && mv -T "${src}" "${dst}" || echo "${src} was not renamed"
+				local exitcode=$?
 				((renamedwc++))
 			fi
 			echo -ne "${renamedwc} / ${totalfileswc} / $files converting ${modprettyname} files to lowercase..." $'\r'
 			((totalfileswc++))
 		done < <(find "${extractdir}" -depth)
 		echo -ne "${renamedwc} / ${totalfileswc} / $files converting ${modprettyname} files to lowercase..."
-		local exitcode=$?
+
 		if [ ${exitcode} -ne 0 ]; then
 			fn_print_fail_eol_nl
+			core_exit.sh
 		else
 			fn_print_ok_eol_nl
 		fi
@@ -213,18 +215,15 @@ fn_check_files_list(){
 	# How many lines is the file list
 		modsfilelistsize="$(cat "${modsdatadir}/${modcommand}-files.txt" | wc -l)"
 		# If file list is empty
-		if [ $modsfilelistsize -eq 0 ]; then
-			fn_print_error_nl "${modcommand}-files.txt is empty"
-			echo "Exiting."
-			fn_scrip_log_fatal "${modcommand}-files.txt is empty"
-			exitcode="2"
+		if [ "${modsfilelistsize}" -eq 0 ]; then
+			fn_print_failure "${modcommand}-files.txt is empty"
+			echo "* Unable to remove ${modprettyname}"
+			fn_script_log_fatal "${modcommand}-files.txt is empty: Unable to remove ${modprettyname}."
 			core_exit.sh
 		fi
 	else
-			fn_print_error_nl "${modsdatadir}/${modcommand}-files.txt don't exist"
-			echo "Exiting."
-			fn_scrip_log_fatal "${modsdatadir}/${modcommand}-files.txt don't exist"
-			exitcode="2"
+		fn_print_failure "${modsdatadir}/${modcommand}-files.txt does not exist"
+		fn_script_log_fatal "${modsdatadir}/${modcommand}-files.txt does not exist: Unable to remove ${modprettyname}."
 		core_exit.sh
 	fi
 }
@@ -578,6 +577,8 @@ fn_installed_mods_update_list(){
 		else
 			echo -e " * ${yellow}${modprettyname}${default} (common custom files remain untouched)"
 		fi
+		((totalmodsinstalled++))
+		fn_script_log_info "${totalmodsinstalled} are already installed"
 	done
 }
 
@@ -598,17 +599,20 @@ fn_mod_get_info_from_command(){
 					modinfocommand="1"
 					break
 				fi
+				((totalmods++))
 			done
+
 		fi
 		# Exit the loop if job is done
 		if [ "${modinfocommand}" == "1" ]; then
 			break
 		fi
 	done
+	fn_script_log_info "${totalmods} are available for install"
 	# What happens if mod is not found
 	if [ "${modinfocommand}" == "0" ]; then
-		fn_script_log_error "Couldn't find information for ${currentmod}"
-		fn_print_error_nl "Couldn't find information for ${currentmod}"
+		fn_script_log_error "Could not find information for ${currentmod}"
+		fn_print_error_nl "Could not find information for ${currentmod}"
 		exitcode="1"
 		core_exit.sh
 	fi

lgsm/functions/mods_list.sh

@@ -64,7 +64,7 @@ fn_mods_info(){
 
 # Get a proper URL for mods that don't provide a good one (optional)
 fn_mods_scrape_urls(){
-	fn_script_log "Retriving latest mods URLs"
+	fn_script_log_info "retrieving latest mods URLs"
 	# Metamod
 	metamodscrapeurl="http://www.gsptalk.com/mirror/sourcemod"
 	metamodlatestfile="$(wget "${metamodscrapeurl}/?MD" -q -O -| grep "mmsource" | grep "\-linux" | head -n1 | awk -F '>' '{ print $3 }' | awk -F '<' '{ print $1}')"