From d6dadb2c180539ad81b0afd268e06bcc5ae1d7d5 Mon Sep 17 00:00:00 2001
From: Ben Wilson <g0tmi1k@kali.org>
Date: Thu, 13 May 2021 10:54:17 +0100
Subject: [PATCH] Add --clean option

---
 .getopt.sh |  3 ++-
 build.sh   | 24 +++++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.getopt.sh b/.getopt.sh
index fd25df3..073750f 100644
--- a/.getopt.sh
+++ b/.getopt.sh
@@ -12,6 +12,7 @@
 #      --subdir <directory-name>
 #      --get-image-path
 #      --no-clean
+#      --clean
 
 BUILD_OPTS_SHORT="d:pa:vDs"
-BUILD_OPTS_LONG="distribution:,proposed-updates,arch:,verbose,debug,salt,installer,live,variant:,version:,subdir:,get-image-path,no-clean"
+BUILD_OPTS_LONG="distribution:,proposed-updates,arch:,verbose,debug,salt,installer,live,variant:,version:,subdir:,get-image-path,no-clean,clean"
diff --git a/build.sh b/build.sh
index 4dce302..7920261 100755
--- a/build.sh
+++ b/build.sh
@@ -106,11 +106,24 @@ debug() {
 		if [ -n "$DEBUG" ]; then
 				echo "DEBUG: $*" >&2
 		fi
+clean() {
+	debug "Cleaning"
+
+	# Live
+	run_and_log $SUDO lb clean --purge
+
+	# Installer
+	run_and_log $SUDO rm -rf simple-cdd/tmp
+	run_and_log $SUDO rm -rf simple-cdd/debian-cd
 }
 
 # Allowed command line options
 . $(dirname $0)/.getopt.sh
 
+BUILD_LOG=$(pwd)/build.log
+debug "BUILD_LOG: $BUILD_LOG"
+# Create empty file
+: > $BUILD_LOG
 # Parsing command line options (see .getopt.sh)
 temp=$(getopt -o "$BUILD_OPTS_SHORT" -l "$BUILD_OPTS_LONG,get-image-path" -- "$@")
 eval set -- "$temp"
@@ -128,6 +141,7 @@ while true; do
 		--version) KALI_VERSION="$2"; shift 2; ;;
 		--subdir) TARGET_SUBDIR="$2"; shift 2; ;;
 		--get-image-path) ACTION="get-image-path"; shift 1; ;;
+		--clean) ACTION="clean"; shift 1; ;;
 		--no-clean) NO_CLEAN="1"; shift 1 ;;
 		--) shift; break; ;;
 		*) echo "ERROR: Invalid command-line option: $1" >&2; exit 1; ;;
@@ -240,6 +254,13 @@ if [ "$ACTION" = "get-image-path" ]; then
 	exit 0
 fi
 
+if [ "$NO_CLEAN" = "" ]; then
+	clean
+fi
+if [ "$ACTION" = "clean" ]; then
+	exit 0
+fi
+
 cd $(dirname $0)
 mkdir -p $TARGET_DIR/$TARGET_SUBDIR
 
@@ -249,9 +270,6 @@ debug "IMAGE_NAME: $IMAGE_NAME"
 # Don't quit on any errors now
 set +e
 
-BUILD_LOG=$(pwd)/build.log
-debug "BUILD_LOG: $BUILD_LOG"
-: > $BUILD_LOG
 
 case "$IMAGE_TYPE" in
 	live)