From 4c5d0ded392c07b8a356b74edddb51bea544c297 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Thu, 1 Jun 2023 09:56:37 +1000 Subject: [PATCH] fix git --quiet --- rename-e-smith-pkg.sh | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/rename-e-smith-pkg.sh b/rename-e-smith-pkg.sh index 04c45a7..1a2abae 100755 --- a/rename-e-smith-pkg.sh +++ b/rename-e-smith-pkg.sh @@ -52,17 +52,7 @@ while read -r line || [[ -n "$line" ]]; do done < "$inifilename" DEBUG= if [ ${smegit_DEBUG} == "true" ] ; then DEBUG=true ; 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" -SILENT="-s" -if [ $DEBUG ] ; then - QUIET= - SILENT="-v" -fi -# Make this null to get curl to check ssl cert -checkSSL="-k" if [[ $smegit_WORKDIR == ~* ]] ; then # relative to users home dir @@ -95,6 +85,17 @@ for param in $2 $3 $4 $5; do break fi done +# Debug settings +# Make this null if you want lots of output. Still quite a bit anyway +QUIET="--quiet" +SILENT="-s" +if [ $DEBUG ] ; then + QUIET= + SILENT="-v" +fi +# Make this null to get curl to check ssl cert +checkSSL="-k" + #Extract SOURCEPKG=$1 TARGETPKG=${SOURCEPKG/e-smith/smeserver} @@ -113,7 +114,7 @@ fi if [ $DEBUG ] ; then echo "Check if $TARGETORG/$TARGETPKG is there!" ; fi RESPONSE=$(curl $SILENT -o /dev/null -w "%{http_code}" "$SOURCEHOST/api/v1/repos/$TARGETORG/$TARGETPKG") if [ "$RESPONSE" == "200" ]; then - echo "Repository for $TARGETORG/$TARGETPKG exists!" + if [ $DEBUG ] ; then echo "Repository for $TARGETORG/$TARGETPKG exists!" ; fi if [ -z ${DELETEIT} ] ; then while true; do read -p "Do you wish to delete it and continue?(y/n) " yn @@ -233,13 +234,13 @@ sed -i "/Show list/{ n; s/Show list of outstanding bugs\:/And a list of outstand sed -i '/Show list/{ n; s/smeserver-/e-smith-/g}' README.md sed -i '/Show list/ s/)/)\\/' README.md -git add README.md $QUIET +git add README.md #Update Makefile # - NAME := smeserver- sed -i 's/e-smith/smeserver/g' Makefile -git add Makefile $QUIET +git add Makefile # spec file #Rename e-smith-.spec as smeserver-.spec @@ -268,7 +269,7 @@ sed -i "s/tar.xz/tar.gz/" "$TARGETPKG.spec" # tell git about the changes git rm "$SOURCEPKG.spec" $QUIET -git add "$TARGETPKG.spec" $QUIET +git add "$TARGETPKG.spec" #Delete archivefilename file if it follows the new standard if [ -e archivefilename ] ; then git rm archivefilename $QUIET ; fi