diff --git a/packaging_script_AppImage.sh b/packaging_script_AppImage.sh index 37e361e3b..5c6dc8f23 100755 --- a/packaging_script_AppImage.sh +++ b/packaging_script_AppImage.sh @@ -9,13 +9,8 @@ git reset --hard origin/master cd .. # get updates -echo -e "\033[1;31m uses the repo submodule (note not yet) n/Y?.\033[m" -read a -if [[ $a == "Y" || $a == "y" ]]; then - git submodule update --init --recursive -else - git pull -fi +git pull --recurse-submodules + sed -i 's/DEFINES += QET_EXPORT_PROJECT_DB/#DEFINES += QET_EXPORT_PROJECT_DB/' qelectrotech.pro GITCOMMIT=$(git rev-parse --short HEAD) diff --git a/packaging_script_Debian_Ubuntu_Windows.sh b/packaging_script_Debian_Ubuntu_Windows.sh index fcdae972c..1f0e1c928 100755 --- a/packaging_script_Debian_Ubuntu_Windows.sh +++ b/packaging_script_Debian_Ubuntu_Windows.sh @@ -12,13 +12,7 @@ SSH_OPTIONS=-B cd $DEFAULT_DIR cd qet_git # get updates -echo -e "\033[1;31m uses the repo submodule (note not yet) n/Y?.\033[m" -read a -if [[ $a == "Y" || $a == "y" ]]; then - git submodule update --init --recursive -else - git pull -fi +git pull --recurse-submodules GITCOMMIT=$(git rev-parse --short HEAD) diff --git a/packaging_script_Flatpak.sh b/packaging_script_Flatpak.sh index d0dd7b879..3e965e50a 100755 --- a/packaging_script_Flatpak.sh +++ b/packaging_script_Flatpak.sh @@ -10,13 +10,7 @@ git reset --hard origin/master cd .. # get updates -echo -e "\033[1;31m uses the repo submodule (note not yet) n/Y?.\033[m" -read a -if [[ $a == "Y" || $a == "y" ]]; then - git submodule update --init --recursive -else - git pull -fi +git pull --recurse-submodules sed -i 's/DEFINES += QET_EXPORT_PROJECT_DB/#DEFINES += QET_EXPORT_PROJECT_DB/' qelectrotech.pro