From 4f8d57498c6698125a65484b00b2d8e54a15e2ae Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Tue, 14 Mar 2017 21:12:38 +0100
Subject: [PATCH] Updated installer version logic

---
 dev/common_install.sh | 10 +++++++---
 dev/merge.sh          | 18 +++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/dev/common_install.sh b/dev/common_install.sh
index 4c21792..f70ed52 100755
--- a/dev/common_install.sh
+++ b/dev/common_install.sh
@@ -1,14 +1,18 @@
 #!/usr/bin/env bash
 
+## Installer script suitable for osync / obackup / pmocr
+
 include #### _OFUNCTIONS_BOOTSTRAP SUBSET ####
 
-PROGRAM=[prgname]
-PROGRAM_VERSION=[version]
+PROGRAM=osync
+
+PROGRAM_VERSION=$(grep "PROGRAM_VERSION=" $PROGRAM.sh)
+PROGRAM_VERSION=${PROGRAM_VERSION#*=}
 PROGRAM_BINARY=$PROGRAM".sh"
 PROGRAM_BATCH=$PROGRAM"-batch.sh"
 SSH_FILTER="ssh_filter.sh"
 
-SCRIPT_BUILD=2017031301
+SCRIPT_BUILD=2017031401
 
 ## osync / obackup / pmocr / zsnap install script
 ## Tested on RHEL / CentOS 6 & 7, Fedora 23, Debian 7 & 8, Mint 17 and FreeBSD 8, 10 and 11
diff --git a/dev/merge.sh b/dev/merge.sh
index 1621c9f..36426d9 100755
--- a/dev/merge.sh
+++ b/dev/merge.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 
-## MERGE 2017020701
+## MERGE 2017031301
 
 ## Merges ofunctions.sh and n_program.sh into program.sh
 ## Adds installer
 
 function __PREPROCESSOR_Merge {
 	PROGRAM=osync
+
 	VERSION=$(grep "PROGRAM_VERSION=" n_$PROGRAM.sh)
 	VERSION=${VERSION#*=}
-
 	__PREPROCESSOR_Constants
 
 	source "ofunctions.sh"
@@ -126,21 +126,21 @@ function __PREPROCESSOR_CleanDebug {
 }
 
 function __PREPROCESSOR_CopyCommons {
-	sed "s/\[prgname\]/$PROGRAM/g" common_install.sh > ../tmp_install.sh
+	sed "s/\[prgname\]/$PROGRAM/g" common_install.sh > ../install.sh
 	if [ $? != 0 ]; then
 		QuickLogger "Cannot assemble install."
 		exit 1
 	fi
 
 	for subset in "${__PREPROCESSOR_SUBSETS[@]}"; do
-		__PREPROCESSOR_MergeSubset "$subset" "${subset//SUBSET/SUBSET END}" "ofunctions.sh" "../tmp_install.sh"
+		__PREPROCESSOR_MergeSubset "$subset" "${subset//SUBSET/SUBSET END}" "ofunctions.sh" "../install.sh"
 	done
 
-	sed "s/\[version\]/$VERSION/g" ../tmp_install.sh > ../install.sh
-	if [ $? != 0 ]; then
-		QuickLogger "Cannot change install version."
-		exit 1
-	fi
+	#sed "s/\[version\]/$VERSION/g" ../tmp_install.sh > ../install.sh
+	#if [ $? != 0 ]; then
+	#	QuickLogger "Cannot change install version."
+	#	exit 1
+	#fi
 	if [ -f "common_batch.sh" ]; then
 		sed "s/\[prgname\]/$PROGRAM/g" common_batch.sh > ../$PROGRAM-batch.sh
 		if [ $? != 0 ]; then