Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bsctl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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")
Expand Down Expand Up @@ -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())
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions shared-scripts/k8s/clear-finalizers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
Loading