FF-177 Updated Scripts, and Application (#11)

* ffighter is now installed in /usr/bin

* Bumped to version v1.6, fixed main script.

* Added releaseWorkflow

* fixed release workflow

* Added one more check, requested by @qvalentin

* Added Download Script

* Updated README.

* Bumped version to 1.6

* fixed bug with copy pasted code.

Author: open-schnick

.github/workflows/releaseWorkflow.yml

@@ -0,0 +1,38 @@
+name: Create new Stable Release
+
+on:
+  push:
+    tags:
+      - "v*.*"
+
+jobs:
+  Create-new-Release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: get version
+        id: vars
+        run: echo ::set-output name=tag::${GITHUB_REF#refs/*/} # pls dont ask me why it has to work like this.
+      - name: move scripts and README
+        run: |
+          TAG=${{ steps.vars.outputs.tag }}
+          mkdir filefighter-$TAG
+          mv lib filefighter-$TAG/lib
+          mv ffighter filefighter-$TAG/ffighter
+          mv Install.sh filefighter-$TAG/Install.sh
+          cp README.md filefighter-$TAG/README.md
+          mv config.cfg filefighter-$TAG/config.cfg
+      - name: move docker-compose
+        run: |
+          TAG=${{ steps.vars.outputs.tag }}
+          mkdir filefighter-$TAG-docker-compose
+          mv docker-compose.yml filefighter-$TAG-docker-compose/docker-compose.yml
+          cp README.md filefighter-$TAG-docker-compose/README.md
+      - name: Create new release and tag.
+        uses: meeDamian/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ steps.vars.outputs.tag }}
+          gzip: folders
+          allow_override: true
+          files: "filefighter-${{ steps.vars.outputs.tag }} filefighter-${{ steps.vars.outputs.tag }}-docker-compose"

Download.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+echo "Downloading FileFighter ClientSetup."
+curl https://codeload.github.com/FileFighter/ClientSetup/zip/master > FileFighter.zip
+
+echo ""
+echo "finshed downloading."
+
+if ! unzip >/dev/null 2>&1; then
+  echo "'unzip' not found. Install it with 'sudo apt install unzip'."
+  exit 1
+fi
+
+
+if [ ! -d "FileFighter" ]; then
+    mkdir FileFighter
+fi
+
+unzip FileFighter.zip -d ./FileFighter
+
+echo ""
+echo "finished unpacking FileFighter. Installing it now..."
+echo ""
+
+chmod -R +x FileFighter/
+$(pwd)/FileFighter/ClientSetup-master/Install.sh

Install.sh

@@ -1,44 +1,43 @@
 #!/bin/bash
-# TODO: update readme.
+
+# Source logo and usage.
+source ./lib/utils.sh
+
+# Move other files in this dir to /home/$USER/filefighter/
+SCRIPTS_LOCATION="/home/$USER/filefighter"
+
+# Move ffighter to this dir.
+APPLICATION_LOCATION="/usr/bin"
 
 # Read in base dir for Path.
-rootDir=$(realpath $0)
-rootDir=${rootDir/%Install.sh} # Very HACKY YES.
-newPATH="PATH=$PATH:$rootDir"
-
-# Add main script to PATH.
-# Check files.
-profile="/home/$USER/.bash_profile"
-login="/home/$USER/.bash_login"
-rc="/home/$USER/.bashrc"
-
-commandToRun=""
-# Checking command.
-ffighter >/dev/null 2>&1
-
-if [ $? == 127 ]; then # command does not exist add it to path
-  echo "Adding FileFighter Application to PATH..."
-  if [[ -f "$profile" ]]; then
-    echo "$newPATH" >>"$profile"
-    commandToRun="source $profile"
-  elif [[ -f "$login" ]]; then
-    echo "$newPATH" >>"$login"
-    commandToRun="source $login"
-  elif [[ -f "$rc" ]]; then
-    echo "$newPATH" >>"$rc"
-    commandToRun="source $rc"
-  else
-    echo "Couldn't add FileFighter Application to PATH. Please contact us at [email protected]."
-    echo "Or add following line to your PATH variable:"
-    echo "$rootDir"
-    exit 1
-  fi
-
-  echo "Adding FileFighter Application to PATH was successful."
-  echo "Please run the following command to finish the installation."
-  echo ""
-  echo $commandToRun
-else
-  echo "FileFighter Application already available"
-  echo "Use: ffighter <args>."
+DOWNLOAD_LOCATION=$(realpath $0)
+DOWNLOAD_LOCATION=${DOWNLOAD_LOCATION/%Install.sh} # Very HACKY YES.
+
+VERSION="v1.6"
+DATE="24.01.21"
+
+echoLogo $VERSION $DATE "Initial Install"
+
+if [ ! -d "/home/$USER" ]; then
+  echo "Home directory for the current user not found. If you are root, switch to a user with a directory under /home/"
+  exit 1
 fi
+
+if [ ! -d $SCRIPTS_LOCATION ]; then
+  echo "Creating Install Location under $SCRIPTS_LOCATION"
+  mkdir $SCRIPTS_LOCATION
+fi
+
+echo "Copying Scripts to new location..."
+cd $DOWNLOAD_LOCATION
+cp -r . $SCRIPTS_LOCATION
+
+echo "Copying FileFighter Application to $APPLICATION_LOCATION..."
+echo "This may need administrator rights (sudo) if you are not root."
+sudo cp $DOWNLOAD_LOCATION/ffighter $APPLICATION_LOCATION
+
+echo ""
+echo "Successfully installed FileFighter!"
+echo "You can delete the downloaded files ($DOWNLOAD_LOCATION) if you want."
+echo ""
+printUsage