From 15d0938b5ae062378ccd74d48c0347e35c5cd55b Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 25 Sep 2020 09:54:42 -0300
Subject: [PATCH] Small adjustments in the windows pack script

---
 win/pack.sh | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/win/pack.sh b/win/pack.sh
index e7901b0..ddea74c 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -38,6 +38,7 @@ TARGET_ARCHS="x86_64"
 GIT_URL="https://github.com/PerryWerneck"
 BUILD_UNSTABLE=0
 MAKE_ZIP=0
+CLEAR_TARGET_PATH=0
 
 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0})))
 WORKDIR=$(mktemp -d)
@@ -83,7 +84,6 @@ failed()
 clone()
 {
 	echo -e "\e]2;Cloning ${1}\a"
-	echo "Cloning ${1}"
 
 	mkdir -p ${WORKDIR}/sources
 
@@ -571,7 +571,16 @@ copy_install_file() {
 	fi
 
 	if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
-		mkdir -p ~/public_html/win/${TARGET_PATH}
+
+		mkdir -p "~/public_html/win/${TARGET_PATH}"
+		if [ "$?" != "0" ]; then
+			failed "Can't create ~/public_html/win/${TARGET_PATH}"
+		fi
+
+		if [ "${CLEAR_TARGET_PATH}" == "1"]; then
+			rm -fr "~/public_html/win/${TARGET_PATH}/*"
+		fi
+
 		ln -f -v "${FILENAME}" ~/public_html/win/${TARGET_PATH}
 		if [ "$?" != "0" ]; then
 			failed "Can't link ${1} to ~/public_html/win/${TARGET_PATH}"
@@ -585,6 +594,10 @@ copy_install_file() {
 			failed "Can't create ${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}"
 		fi
 
+		if [ "${CLEAR_TARGET_PATH}" == "1"]; then
+			rm -fr "${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}/*"
+		fi
+
 		ln -f -v "${FILENAME}" ${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}
 		if [ "$?" != "0" ]; then
 			failed "Can't link ${1} to ~/${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}"
@@ -771,13 +784,21 @@ do
 			;;
 
 		CLEAR)
-			if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
-				rm -fr ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}
-			fi
+			CLEAR_TARGET_PATH=1
 
-			if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}" ]; then
-				rm -fr ${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}/{x86_32,x86_64}
-			fi
+#			if [ ${BUILD_UNSTABLE} == "1" ]; then
+#				CLEAR_TARGET="${PRODUCT_NAME}/unstable"
+#			else
+#				CLEAR_TARGET="${PRODUCT_NAME}/stable"
+#			fi
+#
+#			if [ -d ~/public_html/win/${STORAGE_PATH} ]; then
+#				echo rm -fr ~/public_html/win/${CLEAR_TARGET}/{x86_32,x86_64}
+#			fi
+#
+#			if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${CLEAR_TARGET}" ]; then
+#				echo rm -fr ${XDG_PUBLICSHARE_DIR}/${CLEAR_TARGET}/{x86_32,x86_64}
+#			fi
 
 			;;
 
--
libgit2 0.21.2