fix git --quiet

This commit is contained in:
Trevor Batley 2023-06-01 09:56:37 +10:00
parent 5a13da4d58
commit 4c5d0ded39

View File

@ -52,17 +52,7 @@ while read -r line || [[ -n "$line" ]]; do
done < "$inifilename" done < "$inifilename"
DEBUG= DEBUG=
if [ ${smegit_DEBUG} == "true" ] ; then DEBUG=true ; fi if [ ${smegit_DEBUG} == "true" ] ; then DEBUG=true ; fi
if [ $DEBUG ] ; then echo "************found ini file: $inifilename" ; 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 if [[ $smegit_WORKDIR == ~* ]] ; then
# relative to users home dir # relative to users home dir
@ -95,6 +85,17 @@ for param in $2 $3 $4 $5; do
break break
fi fi
done 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 <pkg> #Extract <pkg>
SOURCEPKG=$1 SOURCEPKG=$1
TARGETPKG=${SOURCEPKG/e-smith/smeserver} TARGETPKG=${SOURCEPKG/e-smith/smeserver}
@ -113,7 +114,7 @@ fi
if [ $DEBUG ] ; then echo "Check if $TARGETORG/$TARGETPKG is there!" ; 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") RESPONSE=$(curl $SILENT -o /dev/null -w "%{http_code}" "$SOURCEHOST/api/v1/repos/$TARGETORG/$TARGETPKG")
if [ "$RESPONSE" == "200" ]; then if [ "$RESPONSE" == "200" ]; then
echo "Repository for $TARGETORG/$TARGETPKG exists!" if [ $DEBUG ] ; then echo "Repository for $TARGETORG/$TARGETPKG exists!" ; fi
if [ -z ${DELETEIT} ] ; then if [ -z ${DELETEIT} ] ; then
while true; do while true; do
read -p "Do you wish to delete it and continue?(y/n) " yn 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/{ n; s/smeserver-/e-smith-/g}' README.md
sed -i '/Show list/ s/)/)\\/' README.md sed -i '/Show list/ s/)/)\\/' README.md
git add README.md $QUIET git add README.md
#Update Makefile #Update Makefile
# - NAME := smeserver-<pkg> # - NAME := smeserver-<pkg>
sed -i 's/e-smith/smeserver/g' Makefile sed -i 's/e-smith/smeserver/g' Makefile
git add Makefile $QUIET git add Makefile
# spec file # spec file
#Rename e-smith-<pkg>.spec as smeserver-<pkg>.spec #Rename e-smith-<pkg>.spec as smeserver-<pkg>.spec
@ -268,7 +269,7 @@ sed -i "s/tar.xz/tar.gz/" "$TARGETPKG.spec"
# tell git about the changes # tell git about the changes
git rm "$SOURCEPKG.spec" $QUIET git rm "$SOURCEPKG.spec" $QUIET
git add "$TARGETPKG.spec" $QUIET git add "$TARGETPKG.spec"
#Delete archivefilename file if it follows the new standard #Delete archivefilename file if it follows the new standard
if [ -e archivefilename ] ; then git rm archivefilename $QUIET ; fi if [ -e archivefilename ] ; then git rm archivefilename $QUIET ; fi