diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 626885c..aaab199 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -21,7 +21,7 @@ then exit 1 fi -CURRENT_VERSION=$(sed -ne 's/^version: \([0-9]\+\.[0-9]\+\.[0-9]\+\)$/\1/p' $ROOT_PATH/Chart.yaml) +CURRENT_VERSION=$(sed -ne 's/^version: \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$/\1/p' $ROOT_PATH/Chart.yaml) MAJOR_VERSION=$(echo $CURRENT_VERSION | cut -d '.' -f 1) MINOR_VERSION=$(echo $CURRENT_VERSION | cut -d '.' -f 2) PATCH_VERSION=$(echo $CURRENT_VERSION | cut -d '.' -f 3) @@ -44,10 +44,10 @@ NEW_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_VERSION echo "Bumping Version $CURRENT_VERSION => $NEW_VERSION..." echo "Updating starter/Chart.yaml..." -sed -i"" "s/^ version: \"$CURRENT_VERSION\"$/ version: \"$NEW_VERSION\"/" $ROOT_PATH/starter/Chart.yaml +sed -i "" "s/^ version: \"$CURRENT_VERSION\"$/ version: \"$NEW_VERSION\"/" $ROOT_PATH/starter/Chart.yaml echo "Updating README.md..." -sed -i"" "/^### Adding Dependency$/,/^### Using Starter$/s;version: $CURRENT_VERSION;version: $NEW_VERSION;" $ROOT_PATH/README.md +sed -i "" "/^### Adding Dependency$/,/^### Using Starter$/s;version: $CURRENT_VERSION;version: $NEW_VERSION;" $ROOT_PATH/README.md echo "Updating Chart.yaml..." -sed -i"" "s/^version: $CURRENT_VERSION$/version: $NEW_VERSION/" $ROOT_PATH/Chart.yaml +sed -i "" "s/^version: $CURRENT_VERSION$/version: $NEW_VERSION/" $ROOT_PATH/Chart.yaml diff --git a/scripts/create-chart.sh b/scripts/create-chart.sh index 60de063..a3c9209 100755 --- a/scripts/create-chart.sh +++ b/scripts/create-chart.sh @@ -14,7 +14,7 @@ echo "Creating chart..." mkdir "$CHART_NAME" curl --proto '=https' --tlsv1.2 -sSf https://codeload.github.com/hahow/common-chart/tar.gz/master | \ tar -xz -C "$CHART_NAME" --strip=2 common-chart-master/starter -find "$CHART_NAME" -type f | xargs sed -i"" "s//$CHART_NAME/g" +find "$CHART_NAME" -type f | xargs sed -i "" "s//$CHART_NAME/g" echo "Building dependencies..." helm dep build "$CHART_NAME"