Merge pull request #924 from pgrenaud/misc-fixes

Miscellaneous fixes

install.sh

@@ -96,7 +96,7 @@ declare -A repos=(
 	["fav-up"]="pielco11/fav-up"
 	["massdns"]="blechschmidt/massdns"
 	["Oralyzer"]="r0075h3ll/Oralyzer"
-	["testssl"]="drwetter/testssl.sh"
+	["testssl.sh"]="drwetter/testssl.sh"
 	["commix"]="commixproject/commix"
 	["JSA"]="w9w/JSA"
 	["CloudHunter"]="belane/CloudHunter"
@@ -231,7 +231,7 @@ function install_tools() {
 			chmod +x ./nomore403
 			;;
 		"ffufPostprocessing")
-			git reset --hard origin/main &>/dev/null
+			git reset --hard origin/master &>/dev/null
 			git pull &>/dev/null
 			go build -o ffufPostprocessing main.go &>/dev/null
 			chmod +x ./ffufPostprocessing
@@ -242,13 +242,16 @@ function install_tools() {
 			go build -o misconfig-mapper &>/dev/null
 			chmod +x ./misconfig-mapper
 			;;
+		"trufflehog")
+			go install &>/dev/null
+			;;
 		esac
 
 		# Copy gf patterns if applicable
 		if [[ $repo == "gf" ]]; then
 			cp -r examples ${HOME}/.gf &>/dev/null
 		elif [[ $repo == "Gf-Patterns" ]]; then
-			mv ./*.json ${HOME}/.gf &>/dev/null
+			cp ./*.json ${HOME}/.gf &>/dev/null
 		fi
 
 		# Return to the main directory
@@ -507,15 +510,6 @@ function initial_setup() {
 		eval git -C "${dir}/sqlmap" pull $DEBUG_STD
 	fi
 
-	# testssl.sh
-	if [[ ! -d "${dir}/testssl.sh" ]]; then
-		#printf "${yellow}Cloning testssl.sh...${reset}\n"
-		eval git clone --depth 1 https://github.com/drwetter/testssl.sh.git "${dir}/testssl.sh" $DEBUG_STD
-	else
-		#printf "${yellow}Updating testssl.sh...${reset}\n"
-		eval git -C "${dir}/testssl.sh" pull $DEBUG_STD
-	fi
-
 	# massdns
 	if [[ ! -d "${dir}/massdns" ]]; then
 		#printf "${yellow}Cloning and compiling massdns...${reset}\n"

reconftw.sh

@@ -122,7 +122,7 @@ function tools_installed() {
 		["dorks_hunter"]="${tools}/dorks_hunter/dorks_hunter.py"
 		["fav-up"]="${tools}/fav-up/favUp.py"
 		["Corsy"]="${tools}/Corsy/corsy.py"
-		["testssl"]="${tools}/testssl.sh/testssl.sh"
+		["testssl.sh"]="${tools}/testssl.sh/testssl.sh"
 		["CMSeeK"]="${tools}/CMSeeK/cmseek.py"
 		["OneListForAll"]="$fuzz_wordlist"
 		["lfi_wordlist"]="$lfi_wordlist"