Strip trailing slash from user input URL. Added count to success message. Added color to output.

Author: adamdehaven

README.md

@@ -2,7 +2,7 @@
 Bash script to spider a site, follow links, and fetch urls -- with some filtering. A list of URLs will be generated and saved to a text file.
 
 [![GitHub release](https://img.shields.io/github/release/adamdehaven/fetchurls.svg?maxAge=3600)](https://github.com/adamdehaven/fetchurls/archive/master.zip)
-[![GitHub commits](https://img.shields.io/github/commits-since/adamdehaven/fetchurls/v1.1.0.svg?maxAge=3600)](https://github.com/adamdehaven/fetchurls/compare/v1.1.0...master)
+[![GitHub commits](https://img.shields.io/github/commits-since/adamdehaven/fetchurls/v1.1.1.svg?maxAge=3600)](https://github.com/adamdehaven/fetchurls/compare/v1.1.1...master)
 [![GitHub issues](https://img.shields.io/github/issues/adamdehaven/fetchurls.svg?maxAge=3600)](https://github.com/adamdehaven/fetchurls/issues)
 [![license](https://img.shields.io/github/license/adamdehaven/fetchurls.svg?maxAge=3600)](https://raw.githubusercontent.com/adamdehaven/fetchurls/master/LICENSE)
 
@@ -57,7 +57,7 @@ The script will crawl the site and compile a list of valid URLs into a text file
 
 ## Extra Info
 
-* To change the default file output location, edit line #21. **Default**: `~/Desktop`
+* To change the default file output location, edit line #7. **Default**: `~/Desktop`
 
 * Ensure that you enter the correct protocol and subdomain for the URL or the outputted file may be empty or incomplete. For example, entering the incorrect, HTTP, protocol for [https://adamdehaven.com](https://adamdehaven.com) generates an empty file. Entering the proper protocol, HTTPS, allows the script to successfully run.
 
@@ -84,4 +84,4 @@ The script will crawl the site and compile a list of valid URLs into a text file
     * /wp-json/
     * xmlrpc
 
-* To change or edit the regular expressions that filter out some pages, directories, and file types, you may edit lines #27 through #36. **Caution**: If you're not familiar with grep and regular expressions, you can easily break the script.
+* To change or edit the regular expressions that filter out some pages, directories, and file types, you may edit lines #35 through #44. **Caution**: If you're not familiar with grep and regular expressions, you can easily break the script.

fetchurls.sh

@@ -3,23 +3,31 @@
 # Ensure you have wget installed and added to environment variable PATH
 # Example source: https://eternallybored.org/misc/wget/
 
+# -----------  SET DEFAULT SAVE LOCATION  -----------
+savelocation=~/Desktop
+
+# -----------  SET COLORS  -----------
+COLOR_RED=$'\e[31m'
+COLOR_CYAN=$'\e[36m'
+COLOR_YELLOW=$'\e[93m'
+COLOR_GREEN=$'\e[32m'
+COLOR_RESET=$'\e[0m'
+
 displaySpinner()
 {
   local pid=$!
   local delay=0.3
   local spinstr='|/-\'
   while [ "$(ps a | awk '{print $1}' | grep $pid)" ]; do
       local temp=${spinstr#?}
-      printf "#    Please wait... [%c]  " "$spinstr" # Count number of backspaces needed (A = 25)
+      printf "${COLOR_RESET}#    ${COLOR_YELLOW}Please wait... [%c]  " "$spinstr${COLOR_RESET}" # Count number of backspaces needed (A = 25)
       local spinstr=$temp${spinstr%"$temp"}
       sleep $delay
       printf "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b" # Number of backspaces from (A)
   done
   printf "                         \b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b" # Number of spaces, then backspaces from (A)
 } # // displaySpinner()
 
-savelocation=~/Desktop
-
 fetchSiteUrls() {
   cd $savelocation && wget --spider -r -nd --max-redirect=30 $DOMAIN 2>&1 \
   | grep '^--' \
@@ -44,23 +52,35 @@ echo "#    Fetch a list of unique URLs for a domain."
 echo "#    "
 echo "#    Enter the full URL ( http://example.com )"
 
-read -e -p "#    URL: " DOMAIN
-DOMAIN=$DOMAIN
+read -e -p "#    URL: ${COLOR_CYAN}" DOMAIN
+DOMAIN="${DOMAIN%/}"
 displaydomain=$(echo ${DOMAIN} | grep -oP "^http(s)?://(www\.)?\K.*")
 filename=$(echo ${DOMAIN} | grep -oP "^http(s)?://(www\.)?\K.*" | tr "." "-")
 
-echo "#    "
-read -e -p "#    Save txt file as: " -i "${filename}" SAVEFILENAME
+echo "${COLOR_RESET}#    "
+read -e -p "#    Save txt file as: ${COLOR_CYAN}" -i "${filename}" SAVEFILENAME
 savefilename=$SAVEFILENAME
 
-echo "#    "
-echo "#    Fetching URLs for ${displaydomain} "
+echo "${COLOR_RESET}#    "
+echo "#    ${COLOR_YELLOW}Fetching URLs for ${displaydomain} ${COLOR_RESET}"
 
 # Start process
 fetchSiteUrls $savefilename & displaySpinner
 
-# Process is complete, output message
-echo "#    Finished!"
+# Process is complete
+
+# Count number of results
+RESULT_COUNT="$(cat ${savelocation}/$savefilename.txt | sed '/^\s*$/d' | wc -l)"
+if [ "$RESULT_COUNT" = 1 ]; then
+  RESULT_MESSAGE="${RESULT_COUNT} Result"
+else
+  RESULT_MESSAGE="${RESULT_COUNT} Results"
+fi
+
+# Output message
+echo "${COLOR_RESET}#    "
+echo "#    ${COLOR_GREEN}Finished with ${RESULT_MESSAGE}!${COLOR_RESET}"
 echo "#    "
-echo "#    File Location: ${savelocation}/$savefilename.txt"
+echo "#    ${COLOR_GREEN}File Location:${COLOR_RESET}"
+echo "#    ${COLOR_GREEN}${savelocation}/$savefilename.txt${COLOR_RESET}"
 echo "#    "