From dff77a9ac255d3f8e1c6e77277edc453c2e0141e Mon Sep 17 00:00:00 2001
From: Christian Kern <christian.kern@siemens.com>
Date: Mon, 29 Jun 2015 16:25:37 +0200
Subject: [PATCH] Revert "merge examples script on jenkins has spaces in path, old script failed to do rsync. Corrected."

This reverts commit d517d62a706e46ed437b0ea2e9f999fd22abab1e.
---
 scripts/merge_examples.sh | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/scripts/merge_examples.sh b/scripts/merge_examples.sh
index 1fd4232..83b323b 100755
--- a/scripts/merge_examples.sh
+++ b/scripts/merge_examples.sh
@@ -110,7 +110,7 @@ EXAMPLES_DIR="$MYTMPDIR_BUILD/doc/examples_raw"
 INTEGRATE_SNIPPETS_SCRIPT="insert_snippets.py"
 EXAMPLES_TARGET_DIR="$PROJECT_DIR_FULLPATH/doc/examples"
 
-if [ -f "$EXAMPLES_DIR/$INTEGRATE_SNIPPETS_SCRIPT" ]; then
+if [ -f $EXAMPLES_DIR/$INTEGRATE_SNIPPETS_SCRIPT ]; then
         cd "$EXAMPLES_DIR"
 
 
@@ -124,12 +124,12 @@ if [ -f "$EXAMPLES_DIR/$INTEGRATE_SNIPPETS_SCRIPT" ]; then
 		exit 1
 	fi
  
-	if [ ! -d "$EXAMPLES_TARGET_DIR" ]; then
+	if [ ! -d $EXAMPLES_TARGET_DIR ]; then
 		echo "---> Examples target dir does not exist. Creating..."
-		redirect_cmd mkdir "$EXAMPLES_TARGET_DIR"
+		redirect_cmd mkdir $EXAMPLES_TARGET_DIR
 	fi
 
-        if [ -d "$EXAMPLES_TARGET_DIR" ]; then
+        if [ -d $EXAMPLES_TARGET_DIR ]; then
                 echo "---> Copy integrated examples back"
                 #The examples have been integrated. Copy the integrated source files back.
                 redirect_cmd rsync --delete --archive --recursive "$EXAMPLES_DIR/" "$EXAMPLES_TARGET_DIR/" \
@@ -137,18 +137,12 @@ if [ -f "$EXAMPLES_DIR/$INTEGRATE_SNIPPETS_SCRIPT" ]; then
                         --exclude=*fragmented.h \
                         --exclude=*snippet.cc \
                         --exclude=*fragmented.cc \
-                        --exclude="*$INTEGRATE_SNIPPETS_SCRIPT"
-                echo redirect_cmd rsync --delete --archive --recursive "$EXAMPLES_DIR/" "$EXAMPLES_TARGET_DIR/" \
-                        --exclude=*snippet.h \
-                        --exclude=*fragmented.h \
-                        --exclude=*snippet.cc \
-                        --exclude=*fragmented.cc \
-                        --exclude="*$INTEGRATE_SNIPPETS_SCRIPT"
+                        --exclude=*$INTEGRATE_SNIPPETS_SCRIPT
 		# for commiting, we must be in the project dir
 		cd "$PROJECT_DIR_FULLPATH"
 	
-		redirect_cmd git add -u "$EXAMPLES_TARGET_DIR"
-		redirect_cmd git add "$EXAMPLES_TARGET_DIR"
+		redirect_cmd git add -u $EXAMPLES_TARGET_DIR
+		redirect_cmd git add $EXAMPLES_TARGET_DIR
 		redirect_cmd git commit -m 'Integrating examples_raw to examples using merge_examples.sh script.'
         fi
 fi
--
libgit2 0.26.0