From e7908d43592261583bdd75700597150b3bf1b2f8 Mon Sep 17 00:00:00 2001 From: "Kevin Veen-Birkenbach [aka. Frantz]" Date: Sun, 3 May 2020 20:32:57 +0200 Subject: [PATCH] Adapted paths and deleted scripts which are not neccessary anymore --- scripts/data/data-backup.sh | 6 ------ scripts/data/export-to-system.sh | 2 +- scripts/data/import-from-system.sh | 2 +- scripts/repositories/pull.sh | 6 ------ scripts/repositories/push.sh | 13 ------------- 5 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 scripts/data/data-backup.sh delete mode 100644 scripts/repositories/pull.sh delete mode 100644 scripts/repositories/push.sh diff --git a/scripts/data/data-backup.sh b/scripts/data/data-backup.sh deleted file mode 100644 index 938edd9..0000000 --- a/scripts/data/data-backup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Executes all scripts which are necessary to backup data -# @author Kevin Veen-Birkenbach [aka. Frantz] -source "$(dirname "$(readlink -f "${0}")")/../base.sh" || (echo "Loading base.sh failed." && exit 1) -bash "$SCRIPT_PATH""client/import-data-from-system.sh" -bash "$SCRIPT_PATH""client/push-local-repositories.sh" diff --git a/scripts/data/export-to-system.sh b/scripts/data/export-to-system.sh index 54debd1..df1d452 100644 --- a/scripts/data/export-to-system.sh +++ b/scripts/data/export-to-system.sh @@ -3,4 +3,4 @@ # @author Kevin Veen-Birkenbach [aka. Frantz] # shellcheck source=/dev/null # Deactivate SC1090 source "$(dirname "$(readlink -f "${0}")")/../base.sh" || (echo "Loading base.sh failed." && exit 1) -bash "$SCRIPT_PATH""client/import-data-from-system.sh" reverse +bash "$SCRIPT_PATH""data/import-from-system.sh" reverse diff --git a/scripts/data/import-from-system.sh b/scripts/data/import-from-system.sh index 19ee6f0..fe7c339 100644 --- a/scripts/data/import-from-system.sh +++ b/scripts/data/import-from-system.sh @@ -9,7 +9,7 @@ source "$(dirname "$(readlink -f "${0}")")/../base.sh" || (echo "Loading base.sh if [ -z "$(mount | grep "$DECRYPTED_PATH")" ] then info "The decrypted folder $DECRYPTED_PATH is locked. You need to unlock it!" && - bash "$SCRIPT_PATH/unlock.sh" || error "Unlocking failed."; + bash "$SCRIPT_PATH""encryption/unlock.sh" || error "Unlocking failed."; fi if [ "$1" = "reverse" ] then diff --git a/scripts/repositories/pull.sh b/scripts/repositories/pull.sh deleted file mode 100644 index ebff298..0000000 --- a/scripts/repositories/pull.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# -# Pushs all repositories -# @author Kevin Veen-Birkenbach [aka. Frantz] -source "$(dirname "$(readlink -f "${0}")")/../base.sh" || (echo "Loading base.sh failed." && exit 1) -bash "$SCRIPT_PATH/push-local-repositories.sh" push diff --git a/scripts/repositories/push.sh b/scripts/repositories/push.sh deleted file mode 100644 index 6885782..0000000 --- a/scripts/repositories/push.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# -# Pushs all repositories -# @param $1 git command which should be executed instead of default pull -# @author Kevin Veen-Birkenbach [aka. Frantz] -source "$(dirname "$(readlink -f "${0}")")/../base.sh" || (echo "Loading base.sh failed." && exit 1) -if [ $# -eq 1 ] - then - git_command=$1 - else - git_command="push" -fi -find $LOCAL_REPOSITORIES_PATH -maxdepth 1 -mindepth 1 -type d -exec bash -c "(cd {} && echo 'In directory: {}' && git status && echo 'Executes git $git_command' && git $git_command --all)" \;