From 8127991919ab111cb3be4307bb7b970bd9c345d4 Mon Sep 17 00:00:00 2001 From: deajan Date: Sat, 12 Nov 2016 00:07:50 +0100 Subject: [PATCH] Rebuilt target --- install.sh | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/install.sh b/install.sh index 1865bc4..d6ce718 100755 --- a/install.sh +++ b/install.sh @@ -4,7 +4,7 @@ PROGRAM=osync PROGRAM_VERSION=1.2-beta2 PROGRAM_BINARY=$PROGRAM".sh" PROGRAM_BATCH=$PROGRAM"-batch.sh" -SCRIPT_BUILD=2016102201 +SCRIPT_BUILD=2016111201 ## osync / obackup / pmocr / zsnap install script ## Tested on RHEL / CentOS 6 & 7, Fedora 23, Debian 7 & 8, Mint 17 and FreeBSD 8 & 10 @@ -12,6 +12,9 @@ SCRIPT_BUILD=2016102201 #TODO: silent mode and no stats mode +# Get current install.sh path from http://stackoverflow.com/a/246128/2635443 +SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + CONF_DIR=$FAKEROOT/etc/$PROGRAM BIN_DIR="$FAKEROOT/usr/local/bin" SERVICE_DIR_INIT=$FAKEROOT/etc/init.d @@ -145,34 +148,34 @@ function CreateConfDir { } function CopyExampleFiles { - if [ -f "./sync.conf.example" ]; then - cp "./sync.conf.example" "$CONF_DIR/sync.conf.example" + if [ -f "$SCRIPT_PATH/sync.conf.example" ]; then + cp "$SCRIPT_PATH/sync.conf.example" "$CONF_DIR/sync.conf.example" fi - if [ -f "./host_backup.conf.example" ]; then - cp "./host_backup.conf.example" "$CONF_DIR/host_backup.conf.example" + if [ -f "$SCRIPT_PATH/host_backup.conf.example" ]; then + cp "$SCRIPT_PATH/host_backup.conf.example" "$CONF_DIR/host_backup.conf.example" fi - if [ -f "./exlude.list.example" ]; then - cp "./exclude.list.example" "$CONF_DIR/exclude.list.example" + if [ -f "$SCRIPT_PATH/exlude.list.example" ]; then + cp "$SCRIPT_PATH/exclude.list.example" "$CONF_DIR/exclude.list.example" fi - if [ -f "./snapshot.conf.example" ]; then - cp "./snapshot.conf.example" "$CONF_DIR/snapshot.conf.example" + if [ -f "$SCRIPT_PATH/snapshot.conf.example" ]; then + cp "$SCRIPT_PATH/snapshot.conf.example" "$CONF_DIR/snapshot.conf.example" fi - if [ -f "./default.conf" ]; then + if [ -f "$SCRIPT_PATH/default.conf" ]; then if [ -f "$CONF_DIR/default.conf" ]; then - cp "./default.conf" "$CONF_DIR/default.conf.new" + cp "$SCRIPT_PATH/default.conf" "$CONF_DIR/default.conf.new" QuickLogger "Copied default.conf to [$CONF_DIR/default.conf.new]." else - cp "./default.conf" "$CONF_DIR/default.conf" + cp "$SCRIPT_PATH/default.conf" "$CONF_DIR/default.conf" fi fi } function CopyProgram { - cp "./$PROGRAM_BINARY" "$BIN_DIR" + cp "$SCRIPT_PATH/$PROGRAM_BINARY" "$BIN_DIR" if [ $? != 0 ]; then QuickLogger "Cannot copy $PROGRAM_BINARY to [$BIN_DIR]. Make sure to run install script in the directory containing all other files." QuickLogger "Also make sure you have permissions to write to [$BIN_DIR]." @@ -182,8 +185,8 @@ function CopyProgram { QuickLogger "Copied $PROGRAM_BINARY to [$BIN_DIR]." fi - if [ -f "./$PROGRAM_BATCH" ]; then - cp "./$PROGRAM_BATCH" "$BIN_DIR" + if [ -f "$SCRIPT_PATH/$PROGRAM_BATCH" ]; then + cp "$SCRIPT_PATH/$PROGRAM_BATCH" "$BIN_DIR" if [ $? != 0 ]; then QuickLogger "Cannot copy $PROGRAM_BATCH to [$BIN_DIR]." else @@ -192,8 +195,8 @@ function CopyProgram { fi fi - if [ -f "./ssh_filter.sh" ]; then - cp "./ssh_filter.sh" "$BIN_DIR" + if [ -f "$SCRIPT_PATH/ssh_filter.sh" ]; then + cp "$SCRIPT_PATH/ssh_filter.sh" "$BIN_DIR" if [ $? != 0 ]; then QuickLogger "Cannot copy ssh_filter.sh to [$BIN_DIR]." else @@ -208,8 +211,8 @@ function CopyProgram { function CopyServiceFiles { # OSYNC SPECIFIC - if ([ "$init" == "systemd" ] && [ -f "./$OSYNC_SERVICE_FILE_SYSTEMD_SYSTEM" ]); then - cp "./$OSYNC_SERVICE_FILE_SYSTEMD_SYSTEM" "$SERVICE_DIR_SYSTEMD_SYSTEM" && cp "./$OSYNC_SERVICE_FILE_SYSTEMD_USER" "$SERVICE_DIR_SYSTEMD_USER/$SERVICE_FILE_SYSTEMD_SYSTEM" + if ([ "$init" == "systemd" ] && [ -f "$SCRIPT_PATH/$OSYNC_SERVICE_FILE_SYSTEMD_SYSTEM" ]); then + cp "$SCRIPT_PATH/$OSYNC_SERVICE_FILE_SYSTEMD_SYSTEM" "$SERVICE_DIR_SYSTEMD_SYSTEM" && cp "$SCRIPT_PATH/$OSYNC_SERVICE_FILE_SYSTEMD_USER" "$SERVICE_DIR_SYSTEMD_USER/$SERVICE_FILE_SYSTEMD_SYSTEM" if [ $? != 0 ]; then QuickLogger "Cannot copy the systemd file to [$SERVICE_DIR_SYSTEMD_SYSTEM] or [$SERVICE_DIR_SYSTEMD_USER]." else @@ -218,8 +221,8 @@ function CopyServiceFiles { QuickLogger "Can be enabled on boot with [systemctl enable osync-srv@instance.conf]." QuickLogger "In userland, active with [systemctl --user start osync-srv@instance.conf]." fi - elif ([ "$init" == "initV" ] && [ -f "./$OSYNC_SERVICE_FILE_INIT" ]); then - cp "./$OSYNC_SERVICE_FILE_INIT" "$SERVICE_DIR_INIT" + elif ([ "$init" == "initV" ] && [ -f "$SCRIPT_PATH/$OSYNC_SERVICE_FILE_INIT" ]); then + cp "$SCRIPT_PATH/$OSYNC_SERVICE_FILE_INIT" "$SERVICE_DIR_INIT" if [ $? != 0 ]; then QuickLogger "Cannot copy osync-srv to [$SERVICE_DIR_INIT]." else @@ -231,8 +234,8 @@ function CopyServiceFiles { fi # PMOCR SPECIFIC - if ([ "$init" == "systemd" ] && [ -f "./$PMOCR_SERVICE_FILE_SYSTEMD_SYSTEM" ]); then - cp "./$PMOCR_SERVICE_FILE_SYSTEMD_SYSTEM" "$SERVICE_DIR_SYSTEMD_SYSTEM" + if ([ "$init" == "systemd" ] && [ -f "$SCRIPT_PATH/$PMOCR_SERVICE_FILE_SYSTEMD_SYSTEM" ]); then + cp "$SCRIPT_PATH/$PMOCR_SERVICE_FILE_SYSTEMD_SYSTEM" "$SERVICE_DIR_SYSTEMD_SYSTEM" if [ $? != 0 ]; then QuickLogger "Cannot copy the systemd file to [$SERVICE_DIR_SYSTEMD_SYSTEM] or [$SERVICE_DIR_SYSTEMD_USER]." else @@ -240,8 +243,8 @@ function CopyServiceFiles { QuickLogger "Can be activated with [systemctl start pmocr-srv@default.conf] where default.conf is the name of the config file in $CONF_DIR." QuickLogger "Can be enabled on boot with [systemctl enable pmocr-srv@default.conf]." fi - elif ([ "$init" == "initV" ] && [ -f "./$PMOCR_SERVICE_FILE_INIT" ]); then - cp "./$PMOCR_SERVICE_FILE_INIT" "$SERVICE_DIR_INIT" + elif ([ "$init" == "initV" ] && [ -f "$SCRIPT_PATH/$PMOCR_SERVICE_FILE_INIT" ]); then + cp "$SCRIPT_PATH/$PMOCR_SERVICE_FILE_INIT" "$SERVICE_DIR_INIT" if [ $? != 0 ]; then QuickLogger "Cannot copy pmoct-srv to [$SERVICE_DIR_INIT]." else