More release script fixes (#7284)

Author: joehan

scripts/publish-vsce.sh

@@ -22,11 +22,6 @@ elif [[ ! ($VERSION == "patch" || $VERSION == "minor" || $VERSION == "major") ]]
   exit 1
 fi
 
-cd firebase-vscode
-echo "Running npm install for VSCode..."
-npm install
-echo "Ran npm install for VSCode."
-
 echo "Making a $VERSION version of VSCode..."
 npm version $VERSION
 NEW_VSCODE_VERSION=$(jq -r ".version" package.json)
@@ -35,6 +30,11 @@ NEW_HEADER="## NEXT \n\n## $NEW_VSCODE_VERSION\n\n- Updated internal firebase-to
 sed -i -e "s/$NEXT_HEADER/$NEW_HEADER/g" CHANGELOG.md
 echo "Made a $VERSION version of VSCode."
 
+cd firebase-vscode
+echo "Running npm install for VSCode..."
+npm install
+echo "Ran npm install for VSCode."
+
 echo "Building firebase-vscode .VSIX file"
 npm run pkg
 echo "Built firebase-vscode .VSIX file."

scripts/publish.sh

@@ -56,7 +56,6 @@ trap "echo 'Missing gsutil.'; exit 1" ERR
 which gstuil &> /dev/null
 trap - ERR
 echo "Checked for commands."
-echo "Checked for commands."
 
 echo "Checking for logged-in npm user..."
 trap "echo 'Please login to npm using \`npm login --registry https://wombat-dressing-room.appspot.com\`'; exit 1" ERR
@@ -114,7 +113,7 @@ echo "Published to npm."
 echo "Cleaning up release notes..."
 rm CHANGELOG.md
 touch CHANGELOG.md
-git commit -m "[firebase-release] Removed change log and reset repo after ${NEW_VERSION} release" CHANGELOG.md firebase-vscode/CHANGELOG.md
+git commit -m "[firebase-release] Removed change log and reset repo after ${NEW_VERSION} release" CHANGELOG.md firebase-vscode/CHANGELOG.md firebase-vscode/package.json firebase-vscode/package-lock.json 
 echo "Cleaned up release notes."
 
 echo "Pushing to GitHub..."