fix suppress
This commit is contained in:
parent
00b2b13244
commit
ad89dc6c4c
@ -243,9 +243,9 @@ RESPONSE=$(curl $checkSSL $curlsilent -o /dev/null -w "%{http_code}" "$GITEAHOST
|
|||||||
if [ "$RESPONSE" == "200" ]; then
|
if [ "$RESPONSE" == "200" ]; then
|
||||||
if [ $DEBUG ] ; then echo "************Repository for $1 already exists!" ; fi
|
if [ $DEBUG ] ; then echo "************Repository for $1 already exists!" ; fi
|
||||||
# If so, clone it (just want the README.md)
|
# If so, clone it (just want the README.md)
|
||||||
if [ $DEBUG ] ; then echo "git clone $GITEAHOST/$ORGGITEA/$1.git" ; fi
|
if [ $DEBUG ] ; then echo "git clone $GITEAHOST/$ORGGITEA/$1.git $suppress" ; fi
|
||||||
cd $GITFiles
|
cd $GITFiles
|
||||||
git clone "$GITEAHOST/$ORGGITEA/$1.git" $suppress
|
git clone "$GITEAHOST/$ORGGITEA/$1.git" "$suppress"
|
||||||
if [[ -f $GITFILES/$1/README.md ]] ; then
|
if [[ -f $GITFILES/$1/README.md ]] ; then
|
||||||
# Move it and remember its new (temp) name
|
# Move it and remember its new (temp) name
|
||||||
READMECONTENTS=`mktemp`
|
READMECONTENTS=`mktemp`
|
||||||
@ -320,8 +320,8 @@ fi
|
|||||||
|
|
||||||
# Pull in the auto created or updated files
|
# Pull in the auto created or updated files
|
||||||
cd $GITFiles
|
cd $GITFiles
|
||||||
#GIT_SSL_NO_VERIFY=true git clone "$GITEAHOST/$ORGGITEA/$1.git"
|
#GIT_SSL_NO_VERIFY=true git clone "$GITEAHOST/$ORGGITEA/$1.git $suppress"
|
||||||
git clone "$GITEAHOST/$ORGGITEA/$1.git"
|
git clone "$GITEAHOST/$ORGGITEA/$1.git" "$suppress"
|
||||||
|
|
||||||
if [ ! -d $GITFiles/$1 ] ; then
|
if [ ! -d $GITFiles/$1 ] ; then
|
||||||
echo "ERROR*******Unable to access the new repo directory for $HTTP_URL $GITFiles/$1"
|
echo "ERROR*******Unable to access the new repo directory for $HTTP_URL $GITFiles/$1"
|
||||||
@ -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
|
# 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.
|
# 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".
|
# 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)
|
# 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.
|
# 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
|
fi
|
||||||
|
|
||||||
# Take out any bogus dates:
|
# 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 it is an SME package, take out the patches and then update the release.
|
||||||
if [[ "$NAME" =~ ^(smeserver-|e-smith-).* ]]; then
|
if [[ "$NAME" =~ ^(smeserver-|e-smith-).* ]]; then
|
||||||
@ -527,7 +527,7 @@ if [[ "$NAME" =~ ^(smeserver-|e-smith-).* ]]; then
|
|||||||
sed -i '/^Patch/d; /^%patch/d' $(basename $SPECFILE)
|
sed -i '/^Patch/d; /^%patch/d' $(basename $SPECFILE)
|
||||||
# no paths need adjusting at this time!
|
# no paths need adjusting at this time!
|
||||||
# Bump the release and add changelog
|
# Bump the release and add changelog
|
||||||
change-log $(basename $SPECFILE) $suppress
|
change-log $(basename $SPECFILE) "$suppress"
|
||||||
# and edit in the reason
|
# and edit in the reason
|
||||||
# sed - TBD - to look for "fix [SME: ]"
|
# sed - TBD - to look for "fix [SME: ]"
|
||||||
sed -i 's/fix \[SME: \]/Roll up patches and move to git repo \[SME: 12338\]/' $(basename $SPECFILE)
|
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
|
if [ ! -e $GITFiles/common ]; then
|
||||||
#Get it
|
#Get it
|
||||||
cd $GITFiles
|
cd $GITFiles
|
||||||
git clone "${smegit_COMMONREPO}" $QUIET
|
git clone "${smegit_COMMONREPO}" "$suppress"
|
||||||
if [ ! -e $GITFiles/common ]; then
|
if [ ! -e $GITFiles/common ]; then
|
||||||
echo "ERROR*******No Common Repo found - package $1"
|
echo "ERROR*******No Common Repo found - package $1"
|
||||||
exit 1
|
exit 1
|
||||||
|
Loading…
Reference in New Issue
Block a user