Fix git-setup.sh (#15560)
This commit is contained in:
+12
-5
@@ -2,7 +2,7 @@
|
||||
# If no project name is given
|
||||
if [ $# -eq 0 ]; then
|
||||
# Display usage and stop
|
||||
echo "Usage: git-setup.sh <console,website>"
|
||||
echo "Usage: git-setup.sh <console,website,platform>"
|
||||
exit 1
|
||||
fi
|
||||
# Get remote url to support either https or ssh
|
||||
@@ -21,11 +21,18 @@ for module in "$@"; do
|
||||
git config -f .gitmodules --unset-all "submodule.apps/$module.branch"
|
||||
# Add the submodule
|
||||
git submodule add --force $project "apps/$module"
|
||||
# Set the default branch to main
|
||||
git config -f .gitmodules --add "submodule.apps/$module.branch" main
|
||||
|
||||
# Update to the latest from main in that submodule
|
||||
cd apps/$module && git pull origin main && cd ../..
|
||||
# Determine the branch based on module
|
||||
branch="main"
|
||||
if [ "$module" = "website" ]; then
|
||||
branch="production"
|
||||
fi
|
||||
|
||||
# Set the default branch
|
||||
git config -f .gitmodules --add "submodule.apps/$module.branch" ${branch}
|
||||
|
||||
# Update to the latest of branch in that submodule
|
||||
cd apps/$module && git pull origin ${branch} && cd ../..
|
||||
|
||||
# We forcefully added the subdmoule which was in .gitignore, so unstage it.
|
||||
git restore --staged apps/$module
|
||||
|
||||
Reference in New Issue
Block a user