diff --git a/git-cvs2git.sh b/git-cvs2git.sh index 2649bff..a5f1844 100755 --- a/git-cvs2git.sh +++ b/git-cvs2git.sh @@ -245,7 +245,7 @@ if [ "$RESPONSE" == "200" ]; then # If so, clone it (just want the README.md) 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" if [[ -f $GITFILES/$1/README.md ]] ; then # Move it and remember its new (temp) name READMECONTENTS=`mktemp` @@ -333,7 +333,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. @@ -519,7 +519,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 @@ -527,7 +527,7 @@ if [[ "$NAME" =~ ^(smeserver-|e-smith-).* ]]; then sed -i '/^Patch/d; /^%patch/d' $(basename $SPECFILE) # no paths need adjusting at this time! # Bump the release and add changelog - change-log $(basename $SPECFILE) $suppress + change-log $(basename $SPECFILE) "$suppress" # and edit in the reason # sed - TBD - to look for "fix [SME: ]" sed -i 's/fix \[SME: \]/Roll up patches and move to git repo \[SME: 12338\]/' $(basename $SPECFILE) @@ -566,7 +566,7 @@ fi if [ ! -e $GITFiles/common ]; then #Get it cd $GITFiles - git clone "${smegit_COMMONREPO}" $QUIET + git clone "${smegit_COMMONREPO}" if [ ! -e $GITFiles/common ]; then echo "ERROR*******No Common Repo found - package $1" exit 1