From 565611f1fe6c83fa929a3326a697fec159f563ad Mon Sep 17 00:00:00 2001 From: Shakeeb Alireza Date: Wed, 8 May 2024 18:35:00 +0300 Subject: [PATCH] snap --- source/scripts/merge_dev.sh | 6 ++++++ source/scripts/update.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 source/scripts/merge_dev.sh diff --git a/source/scripts/merge_dev.sh b/source/scripts/merge_dev.sh new file mode 100755 index 0000000..6319fcd --- /dev/null +++ b/source/scripts/merge_dev.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env sh + +git switch main +git merge dev +git push +git switch dev diff --git a/source/scripts/update.sh b/source/scripts/update.sh index 00f7243..8a0c3b7 100755 --- a/source/scripts/update.sh +++ b/source/scripts/update.sh @@ -89,7 +89,7 @@ function update_chugins() { update_new_chugin WPKorg35 && \ update_new_chugin Wavetable && \ update_new_chugin WinFuncEnv && \ - rm -rf ${PROJECTS_DIR}/chugins-new/chuginate + #rm -rf ${PROJECTS_DIR}/chugins-new/chuginate mv ${PROJECTS_DIR}/chugins ${PROJECTS_DIR}/chugins-old && \ mv ${PROJECTS_DIR}/chugins-new ${PROJECTS_DIR}/chugins && \ rm -rf chugins-src