From ec78ec30495d32a039c72a539fb825f486fc491c Mon Sep 17 00:00:00 2001 From: epi Date: Wed, 19 Apr 2023 17:15:50 -0500 Subject: [PATCH] added ability to specify install directory for install-nix.sh --- README.md | 8 +++++++- install-nix.sh | 22 ++++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index f499298..ac8f700 100644 --- a/README.md +++ b/README.md @@ -97,8 +97,14 @@ sudo apt update && sudo apt install -y feroxbuster #### Linux (32 and 64-bit) & MacOS +Install to a particular directory ``` -curl -sL https://raw.githubusercontent.com/epi052/feroxbuster/master/install-nix.sh | bash +curl -sL https://raw.githubusercontent.com/epi052/feroxbuster/main/install-nix.sh | bash -s $HOME/.local/bin +``` + +Install to current working directory +``` +curl -sL https://raw.githubusercontent.com/epi052/feroxbuster/main/install-nix.sh | bash ``` #### MacOS via Homebrew diff --git a/install-nix.sh b/install-nix.sh index c0e71bf..796f577 100755 --- a/install-nix.sh +++ b/install-nix.sh @@ -13,13 +13,13 @@ LIN64_URL="$BASE_URL/$LIN64_ZIP" EMOJI_URL=https://gist.github.com/epi052/8196b550ea51d0907ad4b93751b1b57d/raw/6112c9f32ae07922983fdc549c54fd3fb9a38e4c/NotoColorEmoji.ttf -echo "[+] Installing feroxbuster!" +INSTALL_DIR="${1:-$(pwd)}" + +echo "[+] Installing feroxbuster to ${INSTALL_DIR}!" which unzip &>/dev/null -if [ "$?" = "0" ]; then - echo "[+] unzip found" -else - echo "[ ] unzip not found, exiting. " +if [ "$?" != "0" ]; then + echo "[!] unzip not found, exiting. " exit -1 fi @@ -27,20 +27,20 @@ if [[ "$(uname)" == "Darwin" ]]; then echo "[=] Found MacOS, downloading from $MAC_URL" curl -sLO "$MAC_URL" - unzip -o "$MAC_ZIP" >/dev/null + unzip -o "$MAC_ZIP" -d "${INSTALL_DIR}" >/dev/null rm "$MAC_ZIP" elif [[ "$(expr substr $(uname -s) 1 5)" == "Linux" ]]; then if [[ $(getconf LONG_BIT) == 32 ]]; then echo "[=] Found 32-bit Linux, downloading from $LIN32_URL" curl -sLO "$LIN32_URL" - unzip -o "$LIN32_ZIP" >/dev/null + unzip -o "$LIN32_ZIP" -d "${INSTALL_DIR}" >/dev/null rm "$LIN32_ZIP" else echo "[=] Found 64-bit Linux, downloading from $LIN64_URL" curl -sLO "$LIN64_URL" - unzip -o "$LIN64_ZIP" >/dev/null + unzip -o "$LIN64_ZIP" -d "${INSTALL_DIR}" >/dev/null rm "$LIN64_ZIP" fi @@ -60,6 +60,8 @@ elif [[ "$(expr substr $(uname -s) 1 5)" == "Linux" ]]; then fi fi -chmod +x ./feroxbuster +chmod +x "${INSTALL_DIR}/feroxbuster" -echo "[+] Installed feroxbuster version $(./feroxbuster -V)" +echo "[+] Installed feroxbuster" +echo " [-] path: ${INSTALL_DIR}/feroxbuster" +echo " [-] version: $(${INSTALL_DIR}/feroxbuster -V | awk '{print $2}')"