From 4b888812ff599c6058b8702ba0d99c7f90c1c808 Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Sat, 6 Aug 2016 16:13:11 +0200
Subject: [PATCH] Revert "Updated merge tool"

This reverts commit 0aee59e05e5809b2232db169125ec8475a0343a6.
---
 dev/merge.sh | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/dev/merge.sh b/dev/merge.sh
index d1426c6..8c53e74 100755
--- a/dev/merge.sh
+++ b/dev/merge.sh
@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 
-## MERGE 2016080601
-
 ## Merges ofunctions.sh and n_program.sh into program.sh
 ## Adds installer
 
-PROGRAM=pmocr
+PROGRAM=obackup
 VERSION=$(grep "PROGRAM_VERSION=" n_$PROGRAM.sh)
 VERSION=${VERSION#*=}
 
@@ -27,9 +25,9 @@ function MergeAll {
 
 function MergeMinimum {
         sed -n "/$MINIMUM_FUNCTION_BEGIN/,/$MINIMUM_FUNCTION_END/p" ofunctions.sh > tmp_minimal.sh
-        sed "/source \"\.\/ofunctions.sh\"/r tmp_minimal.sh" tmp_$PROGRAM.sh | grep -v 'source "./ofunctions.sh"' | grep -v "$PARANOIA_DEBUG_LINE" > debug_$PROGRAM.sh
+        sed "/source \"\.\/ofunctions.sh\"/r tmp_minimal.sh" tmp_$PROGRAM.sh | grep -v 'source "./ofunctions.sh"' | grep -v "$PARANOIA_DEBUG_LINE" > ../$PROGRAM.sh
 	rm -f tmp_minimal.sh
-        chmod +x debug_$PROGRAM.sh
+        chmod +x ../$PROGRAM.sh
 }
 
 
@@ -52,9 +50,7 @@ function CleanDebug {
 function CopyCommons {
 	sed "s/\[prgname\]/$PROGRAM/g" common_install.sh > ../tmp_install.sh
 	sed "s/\[version\]/$VERSION/g" ../tmp_install.sh > ../install.sh
-	if [ -f "common_batch.sh" ]; then
-		sed "s/\[prgname\]/$PROGRAM/g" common_batch.sh > ../$PROGRAM-batch.sh
-	fi
+	sed "s/\[prgname\]/$PROGRAM/g" /home/git/common/common_batch.sh > ../$PROGRAM-batch.sh
 	chmod +x ../install.sh
 	chmod +x ../$PROGRAM-batch.sh
 	rm -f ../tmp_install.sh
@@ -68,4 +64,3 @@ else
 fi
 CleanDebug
 CopyCommons
-rm -f tmp_$PROGRAM.sh