From a6f734ae2bdc273032a01d0b6f3d4cafd25f8bf8 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@amcrypto.jp>
Date: Thu, 15 May 2025 10:29:09 +0900
Subject: [PATCH] Linux: cleanup old build artifacts before performing new
 build

---
 src/Build/build_cmake_deb.sh      | 7 ++++++-
 src/Build/build_cmake_opensuse.sh | 5 +++++
 src/Build/build_cmake_rpm.sh      | 5 +++++
 src/Main/Main.make                | 1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Build/build_cmake_deb.sh b/src/Build/build_cmake_deb.sh
index dcfc8b84..7248b1cd 100755
--- a/src/Build/build_cmake_deb.sh
+++ b/src/Build/build_cmake_deb.sh
@@ -72,6 +72,7 @@ build_and_install() {
         indicator_value="INDICATOR=1"
     fi
 
+    rm -rf "$PARENTDIR/VeraCrypt_Setup/$target"
     make $wxstatic_value $indicator_value $nogui clean || exit 1
     make $wxstatic_value $indicator_value $nogui || exit 1
     make $wxstatic_value $indicator_value $nogui install DESTDIR="$PARENTDIR/VeraCrypt_Setup/$target" || exit 1
@@ -105,7 +106,11 @@ echo "Creating VeraCrypt DEB packages"
 # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack DEB
 # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack DEB
 
-mkdir -p $PARENTDIR/VeraCrypt_Packaging/{GUI,Console}
+# remove old packages
+rm -rf $PARENTDIR/VeraCrypt_Packaging
+
+mkdir -p $PARENTDIR/VeraCrypt_Packaging/GUI
+mkdir -p $PARENTDIR/VeraCrypt_Packaging/Console
 
 cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/GUI -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/GUI" -DNOGUI=FALSE || exit 1
 cpack --config $PARENTDIR/VeraCrypt_Packaging/GUI/CPackConfig.cmake || exit 1
diff --git a/src/Build/build_cmake_opensuse.sh b/src/Build/build_cmake_opensuse.sh
index 954454b0..da4f985f 100644
--- a/src/Build/build_cmake_opensuse.sh
+++ b/src/Build/build_cmake_opensuse.sh
@@ -55,6 +55,7 @@ else
     ln -s $WX_BUILD_DIR/lib  $WX_BUILD_DIR/lib64
 fi
 
+rm -rf "$PARENTDIR/VeraCrypt_Setup/GUI"
 make WXSTATIC=1 clean 				|| exit 1
 make WXSTATIC=1 					|| exit 1
 make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI"	|| exit 1
@@ -77,6 +78,7 @@ else
     ln -s $WX_BUILD_DIR/lib  $WX_BUILD_DIR/lib64
 fi
 
+rm -rf "$PARENTDIR/VeraCrypt_Setup/Console"
 make WXSTATIC=1 NOGUI=1 clean 				|| exit 1
 make WXSTATIC=1 NOGUI=1 					|| exit 1
 make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console"	|| exit 1
@@ -86,6 +88,9 @@ echo "Creating VeraCrypt RPM packages "
 # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM
 # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM
 
+# remove old packages
+rm -rf $PARENTDIR/VeraCrypt_Packaging
+
 mkdir -p $PARENTDIR/VeraCrypt_Packaging/GUI
 mkdir -p $PARENTDIR/VeraCrypt_Packaging/Console
 
diff --git a/src/Build/build_cmake_rpm.sh b/src/Build/build_cmake_rpm.sh
index 60c4354c..3b63e63b 100644
--- a/src/Build/build_cmake_rpm.sh
+++ b/src/Build/build_cmake_rpm.sh
@@ -54,6 +54,7 @@ else
     make WXSTATIC=1 wxbuild || exit 1
 fi
 
+rm -rf "$PARENTDIR/VeraCrypt_Setup/GUI"
 make WXSTATIC=1 clean 				|| exit 1
 make WXSTATIC=1 					|| exit 1
 make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI"	|| exit 1
@@ -75,6 +76,7 @@ else
     make WXSTATIC=1 NOGUI=1 wxbuild || exit 1
 fi
 
+rm -rf "$PARENTDIR/VeraCrypt_Setup/Console"
 make WXSTATIC=1 NOGUI=1 clean 				|| exit 1
 make WXSTATIC=1 NOGUI=1 					|| exit 1
 make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console"	|| exit 1
@@ -84,6 +86,9 @@ echo "Creating VeraCrypt RPM packages "
 # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM
 # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM
 
+# remove old packages
+rm -rf $PARENTDIR/VeraCrypt_Packaging
+
 mkdir -p $PARENTDIR/VeraCrypt_Packaging/GUI
 mkdir -p $PARENTDIR/VeraCrypt_Packaging/Console
 
diff --git a/src/Main/Main.make b/src/Main/Main.make
index b87df209..cda80f53 100755
--- a/src/Main/Main.make
+++ b/src/Main/Main.make
@@ -316,6 +316,7 @@ ifndef TC_NO_GUI
 	cp $(BASE_DIR)/Setup/Linux/$(APPNAME).xml $(BASE_DIR)/Setup/Linux/usr/share/mime/packages/$(APPNAME).xml
 
 	cp $(BASE_DIR)/Resources/Icons/VeraCrypt-256x256.xpm $(BASE_DIR)/Setup/Linux/veracrypt.AppDir/$(APPNAME).xpm
+	rm -fr $(BASE_DIR)/Setup/Linux/veracrypt.AppDir/usr
 	cp -r $(BASE_DIR)/Setup/Linux/usr $(BASE_DIR)/Setup/Linux/veracrypt.AppDir/.
 endif