diff --git a/bsctl/main.go b/bsctl/main.go index 48d87b02..cfa5bcb9 100644 --- a/bsctl/main.go +++ b/bsctl/main.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/spf13/cobra" - pFlag "github.com/spf13/pflag" + pflag "github.com/spf13/pflag" "github.com/spf13/viper" "github.com/mrlunchbox777/basic-setup/bsctl/cmd" @@ -33,7 +33,7 @@ func main() { } func run(factory bsUtil.Factory, getHomeDirFunc GetHomeDirFunc, readInConfigFunc GetReadInConfigFunc) { - flags := pFlag.NewFlagSet("bsctl", pFlag.ExitOnError) + flags := pflag.NewFlagSet("bsctl", pflag.ExitOnError) flags.String("basic-setup-repo", "", "Location on the filesystem where the basic-setup repo is checked out") @@ -78,7 +78,7 @@ func run(factory bsUtil.Factory, getHomeDirFunc GetHomeDirFunc, readInConfigFunc bsCmd := cmd.NewRootCmd(factory) flags.AddFlagSet(bsCmd.PersistentFlags()) - pFlag.CommandLine = flags + pflag.CommandLine = flags cobra.CheckErr(bsCmd.Execute()) } diff --git a/bsctl/scripts/workflows/docs-bump_docs-bump_CHANGELOG-bump.sh b/bsctl/scripts/workflows/docs-bump_docs-bump_CHANGELOG-bump.sh index 9292e90a..0ba54a94 100755 --- a/bsctl/scripts/workflows/docs-bump_docs-bump_CHANGELOG-bump.sh +++ b/bsctl/scripts/workflows/docs-bump_docs-bump_CHANGELOG-bump.sh @@ -28,7 +28,7 @@ fi currentDay=$(date +%d) branchDay=$(echo $branchLatestLog | sed 's/.* - \([0-9]*\)-\([0-9]*\)-\([0-9]*\)/\3/') -if [ "$currentDay" == "" ]; then +if [ -z "$currentDay" ]; then echo "Failed to get current day" exit 1 fi diff --git a/shared-scripts/k8s/clear-finalizers.sh b/shared-scripts/k8s/clear-finalizers.sh index cee7488a..9db7efde 100644 --- a/shared-scripts/k8s/clear-finalizers.sh +++ b/shared-scripts/k8s/clear-finalizers.sh @@ -4,7 +4,7 @@ # Environment Validation # validation="$(environment-validation -c -l "core" 2>&1)" -if [ ! -z "$validation" ]; then +if [ -n "$validation" ]; then echo "Validation error:" >&2 echo "$validation" >&2 exit 1 @@ -113,7 +113,7 @@ done [ $SHOW_HELP == true ] && help && exit 0 # set all namespaces flag -if [ ! -z "$NAMESPACE" ]; then +if [ -n "$NAMESPACE" ]; then ALL_NAMESPACES=false fi