1
0
mirror of https://github.com/deajan/obackup.git synced 2024-11-15 04:03:41 +01:00

Updated merge / bootstrap from osync

This commit is contained in:
deajan 2018-03-25 14:16:31 +02:00
parent d9b61f2aaf
commit c7e3bc3e5f
2 changed files with 9 additions and 3 deletions

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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 ## Yeah !!! A really tech sounding name... In fact it's just include emulation in bash
function Usage { function Usage {
@ -9,6 +9,7 @@ function Usage {
echo "Usage:" echo "Usage:"
echo "" echo ""
echo "$0 --program=osync|osync_target_helper|obackup|pmocr [options to pass to program]" 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" termux-fix-shebang "$outputFileName.tmp.sh"
fi fi
"$outputFileName.tmp.sh" $opts if [ "$BASH_VERBOSE" == "yes" ]; then
bash -x "$outputFileName.tmp.sh" $opts
else
"$outputFileName.tmp.sh" $opts
fi

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
## MERGE 2017061901 ## MERGE 2018021901
## Merges ofunctions.sh and n_program.sh into program.sh ## Merges ofunctions.sh and n_program.sh into program.sh
## Adds installer ## Adds installer
@ -59,6 +59,7 @@ function __PREPROCESSOR_Constants {
'#### VerComp SUBSET ####' '#### VerComp SUBSET ####'
'#### GetConfFileValue SUBSET ####' '#### GetConfFileValue SUBSET ####'
'#### SetConfFileValue SUBSET ####' '#### SetConfFileValue SUBSET ####'
'#### CheckRFC822 SUBSET ####'
) )
} }