From 0bfbc37bc9e2e9f411c88f9325debac3498a8719 Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Sat, 7 Nov 2020 22:38:28 +0100 Subject: [PATCH] Add git submodule instruction --- packaging_script_AppImage.sh | 9 ++++++++- packaging_script_Debian_Ubuntu_Windows.sh | 9 ++++++++- packaging_script_Flatpak.sh | 8 +++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/packaging_script_AppImage.sh b/packaging_script_AppImage.sh index 647680fa4..37e361e3b 100755 --- a/packaging_script_AppImage.sh +++ b/packaging_script_AppImage.sh @@ -8,7 +8,14 @@ cd sources git reset --hard origin/master cd .. -git pull +# 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 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 8290c45c1..fcdae972c 100755 --- a/packaging_script_Debian_Ubuntu_Windows.sh +++ b/packaging_script_Debian_Ubuntu_Windows.sh @@ -11,7 +11,14 @@ SSH_OPTIONS=-B cd $DEFAULT_DIR cd qet_git -git pull +# 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 GITCOMMIT=$(git rev-parse --short HEAD) diff --git a/packaging_script_Flatpak.sh b/packaging_script_Flatpak.sh index cf6fa3424..d0dd7b879 100755 --- a/packaging_script_Flatpak.sh +++ b/packaging_script_Flatpak.sh @@ -10,7 +10,13 @@ git reset --hard origin/master cd .. # get updates -git pull +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 sed -i 's/DEFINES += QET_EXPORT_PROJECT_DB/#DEFINES += QET_EXPORT_PROJECT_DB/' qelectrotech.pro