test
This commit is contained in:
+3
-3
@@ -4,13 +4,13 @@ set -e
|
|||||||
#-----------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------
|
||||||
# --------------------------- Core Rsync Script for Unraid -------------------------------------
|
# --------------------------- Core Rsync Script for Unraid -------------------------------------
|
||||||
#-----------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
source "$SCRIPT_DIR/../common.sh"
|
source "$SCRIPT_DIR/../common.sh"
|
||||||
|
|
||||||
# Load Master.conf and detect remote server
|
# Load config
|
||||||
load_master_conf
|
load_master_conf
|
||||||
detect_remote
|
|
||||||
|
# Parse arguments, etc...
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------
|
||||||
# --------------------------- Input Arguments --------------------------------------------------
|
# --------------------------- Input Arguments --------------------------------------------------
|
||||||
|
|||||||
@@ -13,9 +13,13 @@
|
|||||||
#-----------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------
|
||||||
# Load Master.conf
|
# Load Master.conf
|
||||||
load_master_conf() {
|
load_master_conf() {
|
||||||
|
# Resolve the folder of the calling script (rsync.sh)
|
||||||
local script_dir
|
local script_dir
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
|
||||||
|
# Master.conf is one level up from Rsync/
|
||||||
local master_conf="$script_dir/../Master.conf"
|
local master_conf="$script_dir/../Master.conf"
|
||||||
|
|
||||||
if [ -f "$master_conf" ]; then
|
if [ -f "$master_conf" ]; then
|
||||||
source "$master_conf"
|
source "$master_conf"
|
||||||
echo "Loaded Master.conf from $master_conf"
|
echo "Loaded Master.conf from $master_conf"
|
||||||
|
|||||||
Reference in New Issue
Block a user