You've already forked Atomcms-edit
fix: checkout main before git pull in update script
This commit is contained in:
+3
-3
@@ -68,7 +68,7 @@ echo "=== Starting EPIC WEB CONTROL Update ==="
|
|||||||
# ----------------------------------------
|
# ----------------------------------------
|
||||||
echo "--> Updating Emulator..."
|
echo "--> Updating Emulator..."
|
||||||
cd "$EMULATOR_DIR/Emulator/"
|
cd "$EMULATOR_DIR/Emulator/"
|
||||||
git stash --include-untracked || true && git pull
|
git stash --include-untracked || true && git checkout main && git pull
|
||||||
|
|
||||||
# --- Automatic Safe Database Backup ---
|
# --- Automatic Safe Database Backup ---
|
||||||
echo "--> Creating automatic database backup before update..."
|
echo "--> Creating automatic database backup before update..."
|
||||||
@@ -119,7 +119,7 @@ chmod +x emulator
|
|||||||
echo "--> Updating Nitro_Render_V3..."
|
echo "--> Updating Nitro_Render_V3..."
|
||||||
cd "$NITRO_RENDERER/"
|
cd "$NITRO_RENDERER/"
|
||||||
|
|
||||||
git stash --include-untracked || true && git pull
|
git stash --include-untracked || true && git checkout main && git pull
|
||||||
|
|
||||||
echo "--> Running yarn install for Nitro_Render_V3..."
|
echo "--> Running yarn install for Nitro_Render_V3..."
|
||||||
clean_node_modules
|
clean_node_modules
|
||||||
@@ -132,7 +132,7 @@ yarn install
|
|||||||
echo "--> Updating Nitro-V3..."
|
echo "--> Updating Nitro-V3..."
|
||||||
cd "$NITRO_CLIENT"
|
cd "$NITRO_CLIENT"
|
||||||
|
|
||||||
git stash --include-untracked || true && git pull
|
git stash --include-untracked || true && git checkout main && git pull
|
||||||
|
|
||||||
echo "--> Running yarn install for Nitro-V3..."
|
echo "--> Running yarn install for Nitro-V3..."
|
||||||
clean_node_modules
|
clean_node_modules
|
||||||
|
|||||||
Reference in New Issue
Block a user