From 0e2189c441eb6517bfb1b9ddfe31e33272c653b1 Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 8 Oct 2018 21:29:47 +0200 Subject: [PATCH] Added RUN_DIR subset --- dev/merge.sh | 3 ++- dev/ofunctions.sh | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dev/merge.sh b/dev/merge.sh index fcdde47..f9d9042 100755 --- a/dev/merge.sh +++ b/dev/merge.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## MERGE 2018100204 +## MERGE 2018100801 ## Merges ofunctions.sh and n_program.sh into program.sh ## Adds installer @@ -46,6 +46,7 @@ function __PREPROCESSOR_Constants { '#### OFUNCTIONS MICRO SUBSET ####' '#### PoorMansRandomGenerator SUBSET ####' '#### _OFUNCTIONS_BOOTSTRAP SUBSET ####' + '#### RUN_DIR SUBSET ####' '#### DEBUG SUBSET ####' '#### TrapError SUBSET ####' '#### RemoteLogger SUBSET ####' diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh index db18d18..497044b 100644 --- a/dev/ofunctions.sh +++ b/dev/ofunctions.sh @@ -31,7 +31,7 @@ #### OFUNCTIONS MINI SUBSET #### #### OFUNCTIONS MICRO SUBSET #### _OFUNCTIONS_VERSION=2.3.0-RC2 -_OFUNCTIONS_BUILD=2018100801 +_OFUNCTIONS_BUILD=2018100802 #### _OFUNCTIONS_BOOTSTRAP SUBSET #### _OFUNCTIONS_BOOTSTRAP=true #### _OFUNCTIONS_BOOTSTRAP SUBSET END #### @@ -104,6 +104,7 @@ else LOG_FILE="/tmp/$PROGRAM.log" fi +#### RUN_DIR SUBSET #### ## Default directory where to store temporary run files if [ -w /tmp ]; then RUN_DIR=/tmp @@ -112,6 +113,7 @@ elif [ -w /var/tmp ]; then else RUN_DIR=. fi +#### RUN_DIR SUBSET END #### #### PoorMansRandomGenerator SUBSET #### # Get a random number on Windows BusyBox alike, also works on most Unixes that have dd, if dd is not found, then return $RANDOM