diff --git a/git-cvs2git.sh b/git-cvs2git.sh index a5f1844..0a6ee5a 100755 --- a/git-cvs2git.sh +++ b/git-cvs2git.sh @@ -77,12 +77,10 @@ if [ $NOISY ] ; then echo "git-cvs2git.sh $1 $2 $3 $4 $5 $6" ; fi if [ $DEBUG ] ; then echo "************found ini file: $inifilename" ; fi # Make this null if you want lots of output. Still quite a bit anyway QUIET="-q" -curlsilent="-s" -suppress=" &> /dev/null" +SILENT="-s" if [ $DEBUG ] ; then QUIET= - curlsilent="-v" - suppress= + SILENT="-v" fi # Make this null to get curl to check ssl cert checkSSL="-k" @@ -239,7 +237,7 @@ fi REPO_NAME=$1 if [ $DEBUG ] ; then echo "check that $GITEAHOST/$ORGGITEA/$REPO_NAME exists" ; fi READMECONTENTS= -RESPONSE=$(curl $checkSSL $curlsilent -o /dev/null -w "%{http_code}" "$GITEAHOST/api/v1/repos/$ORGGITEA/$REPO_NAME") +RESPONSE=$(curl $checkSSL $SILENT -o /dev/null -w "%{http_code}" "$GITEAHOST/api/v1/repos/$ORGGITEA/$REPO_NAME") if [ "$RESPONSE" == "200" ]; then if [ $DEBUG ] ; then echo "************Repository for $1 already exists!" ; fi # If so, clone it (just want the README.md) @@ -253,7 +251,7 @@ if [ "$RESPONSE" == "200" ]; then fi # Now delete the repo, re-create it and clone it in to local if [ $DEBUG ] ; then echo "Delete $ORGGITEA/$1" ; fi - RESPONSE=$(curl "$checkSSL" "$curlsilent" -o /dev/null -w "%{http_code}" -X 'DELETE' \ + RESPONSE=$(curl "$checkSSL" "$SILENT" -o /dev/null -w "%{http_code}" -X 'DELETE' \ "$GITEAHOST/api/v1/repos/$ORGGITEA/$1" \ -H 'accept: application/json' \ -H "Authorization: token $GITEAACCESSTOKEN") @@ -279,7 +277,7 @@ cd $GITFiles # Re-create the repo # if [ $DEBUG ] ; then echo "************Creating repo for $1 $PACKAGETYPE" ; fi -RESPONSE=$(curl "$checkSSL" "$curlsilent" -X 'POST' \ +RESPONSE=$(curl "$checkSSL" "$SILENT" -X 'POST' \ "$GITEAHOST/api/v1/orgs/$ORGGITEA/repos" \ -H 'accept: application/json' \ -H "Authorization: token $GITEAACCESSTOKEN" \ @@ -310,7 +308,7 @@ if [[ -z "${HTTP_URL}" ]]; then fi # And check it now exists -RESPONSE=$(curl "$curlsilent" -o /dev/null -w "%{http_code}" "$GITEAHOST/api/v1/repos/$ORGGITEA/$1") +RESPONSE=$(curl "$SILENT" -o /dev/null -w "%{http_code}" "$GITEAHOST/api/v1/repos/$ORGGITEA/$1") if [[ "$RESPONSE" == "200" ]]; then if [ $DEBUG ] ; then echo "************Repository for $1 exists" ; fi else @@ -333,7 +331,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 "$SILENT" prep # 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 +517,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) # If it is an SME package, take out the patches and then update the release. if [[ "$NAME" =~ ^(smeserver-|e-smith-).* ]]; then @@ -527,7 +525,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) # 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) @@ -646,7 +644,7 @@ if [[ "$NAME" =~ ^(smeserver-|e-smith-).* ]]; then model="text-davinci-003" temperature=0.8 # Send the request to the API - response=$(curl "$curlsilent" -X POST https://api.openai.com/v1/engines/$model/completions \ + response=$(curl "$SILENT" -X POST https://api.openai.com/v1/engines/$model/completions \ -H "Content-Type: application/json" \ -H "Authorization: Bearer $OPENAI_API_KEY" \ -d '{"prompt": "'"$prompt"'", "temperature": 0.8, "max_tokens": 256}') @@ -670,7 +668,7 @@ else model="text-davinci-003" temperature=0.8 # Send the request to the API - response=$(curl "$curlsilent" -X POST https://api.openai.com/v1/engines/$model/completions \ + response=$(curl "$SILENT" -X POST https://api.openai.com/v1/engines/$model/completions \ -H "Content-Type: application/json" \ -H "Authorization: Bearer $OPENAI_API_KEY" \ -d '{"prompt": "'"$prompt"'", "temperature": 0.8, "max_tokens": 256}') @@ -695,7 +693,7 @@ if [[ -z $WIKILINK ]] ; then fi # and then update the repo parameters -RESPONSE=$(curl "$curlsilent" -X 'PATCH' "$GITEAHOST/api/v1/repos/$ORGGITEA/$REPO_NAME" \ +RESPONSE=$(curl "$SILENT" -X 'PATCH' "$GITEAHOST/api/v1/repos/$ORGGITEA/$REPO_NAME" \ -H 'accept: application/json' \ -H "Authorization: token $GITEAACCESSTOKEN" \ -H 'Content-Type: application/json' \