diff --git a/dev/merge.sh b/dev/merge.sh index 93138b2..fbc8d74 100755 --- a/dev/merge.sh +++ b/dev/merge.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash -## MERGE 2016121101 +## MERGE 2016121901 ## Merges ofunctions.sh and n_program.sh into program.sh ## Adds installer function __PREPROCESSOR_Merge { - PROGRAM=osync + PROGRAM=pmocr VERSION=$(grep "PROGRAM_VERSION=" n_$PROGRAM.sh) VERSION=${VERSION#*=} @@ -40,7 +40,7 @@ function __PREPROCESSOR_Constants { __PREPROCESSOR_SUBSETS=( '#### OFUNCTIONS FULL SUBSET ####' - '#### OFUNCTIONS MINIMAL SUBSET ####' + '#### OFUNCTIONS MINI SUBSET ####' '#### _OFUNCTIONS_BOOTSTRAP SUBSET ####' '#### DEBUG SUBSET ####' '#### TrapError SUBSET ####'