From 59b371fdd3decd5d94862e7dbee5da98c6283eb1 Mon Sep 17 00:00:00 2001
From: Trevor Batley <trevor@batley.id.au>
Date: Mon, 22 May 2023 11:49:42 +1000
Subject: [PATCH] fix suppress statements

---
 git-cvs2git.sh | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/git-cvs2git.sh b/git-cvs2git.sh
index a77ca3f..fb9710f 100755
--- a/git-cvs2git.sh
+++ b/git-cvs2git.sh
@@ -134,7 +134,7 @@ fi
 
 # Make sure credentials taken from store
 # The first time you pull or push it will ask for credentials and then save them in a file.
-git config --global credential.helper store $suppress
+git config --global credential.helper store "$suppress"
 
 #
 # Clone the CVS repository
@@ -227,7 +227,7 @@ if [ "$RESPONSE" == "200" ]; then
 	# And Clone it
     if [ $DEBUG ] ; then echo "git clone $GITEAHOST/$ORGGITEA/$1.git" ; fi
 	cd $GITFiles
-	git clone "$GITEAHOST/$ORGGITEA/$1.git" $suppress
+	git clone "$GITEAHOST/$ORGGITEA/$1.git" "$suppress"
 	#GIT_SSL_NO_VERIFY=true git clone "$GITEAHOST/$ORGGITEA/$1.git" 
     NOREPO=0
 else
@@ -337,7 +337,7 @@ fi
 # Pull in the auto created or updated files
 cd $GITFiles
 #GIT_SSL_NO_VERIFY=true git clone "$GITEAHOST/$ORGGITEA/$1.git" 
-git clone "$GITEAHOST/$ORGGITEA/$1.git" $suppress
+git clone "$GITEAHOST/$ORGGITEA/$1.git" "$suppress"
 
 if [ ! -d $GITFiles/$1 ] ; then 
   echo "ERROR*******Unable to access the new repo directory for $HTTP_URL $GITFiles/$1"
@@ -349,7 +349,7 @@ cd $CVSFiles/$1/$BASEORCONTRIB
 # Fully populate the directory (gets the tar file - which is not strictly in CVS) and creates the directory source tree
 # applying the patches to the base in the tar file.
 # Might need to replace this by the code from the makefile if we decide to move "make prep" to git moe likely we'll implement a new one "make gitprep".
-make prep $suppress
+make prep "$suppress"
 
 # Extract the directory name for the file tree (it will include the name of the module plus some version information)
 # Same trick that we use in the makefile.common  - taking the name and verison from the .spec file.
@@ -516,9 +516,9 @@ else
 	# Third party package
 	# copy over the archive file and make sure the extension is tracked by git-lfs
 	if [ $DEBUG ] ; then echo "************Found 3rd party package $NAME" ; fi
-	git lfs install $suppress
-	git lfs track "*.$EXT" $suppress
-	git add .gitattributes $suppress
+	git lfs install "$suppress"
+	git lfs track "*.$EXT" "$suppress"
+	git add .gitattributes "$suppress"
 	#git config lfs.http://gitea.bjsystems.co.uk/SMEContribs/bugzilla.git/info/lfs.locksverify true
 	if [[ -f $CVSFiles/$1/$BASEORCONTRIB/$ARCHIVEFILE ]] ; then 
 		if [ $DEBUG ] ; then echo "************Copying archivefile $CVSFiles/$1/$BASEORCONTRIB/$ARCHIVEFILE" ; fi
@@ -535,7 +535,7 @@ if [[ $ARCHIVEFILE != "$TREEPATH.tar.gz" ]] ; then
 fi
 
 # Take out any bogus dates:
-/usr/bin/BogusDateBot.sh $(basename $SPECFILE) $suppress
+/usr/bin/BogusDateBot.sh $(basename $SPECFILE) "$suppress"
 
 # If it is an SME package, take out the patches and then update the release.
 if [[ "$NAME" =~ ^(smeserver-|e-smith-).* ]]; then
@@ -590,7 +590,7 @@ if [ ! -e $GITFiles/common ]; then
 else
   # Just refresh it
   cd $GITFiles/common
-  git pull $suppress
+  git pull "$suppress"
 fi 
 
 # Now make sure that the make-archive is executible
@@ -732,24 +732,24 @@ if [ $DEBUG ] ; then echo $RESPONSE ; fi
 
 cd $GITFiles/$1
 # stage and commit all the files created locally
-git add -A $suppress
+git add -A "$suppress"
 echo "$1 git status" >>gitstatus.log
 git status >>gitstatus.log
-git status $suppress
+git status "$suppress"
 COMMENT="initial commit of file from CVS for $1 on `date`"
 git commit -m  "$COMMENT" $QUIET
 
 # push the converted git repository to the remote
-git remote remove origin $suppress
-git remote add origin "$GITEAHOST/$ORGGITEA/$1.git" $suppress
+git remote remove origin "$suppress"
+git remote add origin "$GITEAHOST/$ORGGITEA/$1.git" "$suppress"
 #GIT_SSL_NO_VERIFY=true git push --force -u $QUIET origin master
-git push --force -u $QUIET origin master $suppress
+git push --force -u $QUIET origin master "$suppress"
 
 # Now create the version and release tag for these files
 RELEASE=`rpm --queryformat '%{release}\n' --specfile $NAME.spec | head -n 1`
 TAG=$VERSION-$RELEASE
-git tag -a $TAG -m "$COMMENT" $suppress
-git push origin $TAG $suppress
+git tag -a $TAG -m "$COMMENT" "$suppress"
+git push origin $TAG "$suppress"
 
 echo "Created $1 Repo: $HTTP_URL - Comment:$COMMENT tag:$TAG"
 exit 0