From c7e3bc3e5fa034bf966b63b20cedbe4dfa4a9531 Mon Sep 17 00:00:00 2001 From: deajan Date: Sun, 25 Mar 2018 14:16:31 +0200 Subject: [PATCH] Updated merge / bootstrap from osync --- dev/bootstrap.sh | 9 +++++++-- dev/merge.sh | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh index c202cb8..bb663c7 100755 --- a/dev/bootstrap.sh +++ b/dev/bootstrap.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## dev pre-processor bootstrap rev 2017062001 +## dev pre-processor bootstrap rev 2018032201 ## Yeah !!! A really tech sounding name... In fact it's just include emulation in bash function Usage { @@ -9,6 +9,7 @@ function Usage { echo "Usage:" echo "" echo "$0 --program=osync|osync_target_helper|obackup|pmocr [options to pass to program]" + echo "Can also be run with BASHVERBOSE=YES environment variable in order to prefix program with bash -x" } @@ -67,4 +68,8 @@ if type termux-fix-shebang > /dev/null 2>&1; then termux-fix-shebang "$outputFileName.tmp.sh" fi -"$outputFileName.tmp.sh" $opts +if [ "$BASH_VERBOSE" == "yes" ]; then + bash -x "$outputFileName.tmp.sh" $opts +else + "$outputFileName.tmp.sh" $opts +fi diff --git a/dev/merge.sh b/dev/merge.sh index b2eec78..13a5afc 100755 --- a/dev/merge.sh +++ b/dev/merge.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## MERGE 2017061901 +## MERGE 2018021901 ## Merges ofunctions.sh and n_program.sh into program.sh ## Adds installer @@ -59,6 +59,7 @@ function __PREPROCESSOR_Constants { '#### VerComp SUBSET ####' '#### GetConfFileValue SUBSET ####' '#### SetConfFileValue SUBSET ####' + '#### CheckRFC822 SUBSET ####' ) }