From 8ab90fa6b0595820fab8d6a874afca3c0238a56a Mon Sep 17 00:00:00 2001
From: lucianposton <lucianposton@pm.me>
Date: Tue, 24 Mar 2020 21:43:25 -0500
Subject: [PATCH] Merge confidential file excludes into single -c option (#28)

Signed-off-by: Lucian Poston <lucianposton@pm.me>
---
 mkstage4.sh     | 11 ++++++-----
 tests/0001.bats |  4 ++--
 tests/0005.bats | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/mkstage4.sh b/mkstage4.sh
index 146878c..4262f92 100755
--- a/mkstage4.sh
+++ b/mkstage4.sh
@@ -8,7 +8,7 @@ fi
 
 #set flag variables to null
 EXCLUDE_BOOT=0
-EXCLUDE_CONNMAN=0
+EXCLUDE_CONFIDENTIAL=0
 EXCLUDE_LOST=0
 QUIET=0
 USER_EXCL=()
@@ -24,7 +24,7 @@ fi
 USAGE="usage:\n\
 	$(basename "$0") [-q -c -b -l -k -p] [-s || -t <target-mountpoint>] [-e <additional excludes dir*>] <archive-filename> [custom-tar-options]\n\
 	-q: activates quiet mode (no confirmation).\n\
-	-c: excludes connman network lists.\n\
+	-c: excludes some confidential files (currently only .bash_history and connman network lists).\n\
 	-b: excludes boot directory.\n\
 	-l: excludes lost+found directory.\n\
 	-p: compresses parallelly using pbzip2.\n\
@@ -51,7 +51,7 @@ do
 			S_KERNEL=1
 			;;
 		c)
-			EXCLUDE_CONNMAN=1
+			EXCLUDE_CONFIDENTIAL=1
 			;;
 		b)
 			EXCLUDE_BOOT=1
@@ -134,7 +134,6 @@ fi
 
 # Excludes:
 EXCLUDES=(
-	"--exclude=${TARGET}home/*/.bash_history"
 	"--exclude=${TARGET}dev/*"
 	"--exclude=${TARGET}var/tmp/*"
 	"--exclude=${TARGET}media/*"
@@ -171,8 +170,10 @@ else
 	EXCLUDES+=("${EXCLUDES_DEFAULT_PORTAGE[@]}")
 fi
 
-if ((EXCLUDE_CONNMAN))
+if ((EXCLUDE_CONFIDENTIAL))
 then
+	EXCLUDES+=("--exclude=${TARGET}home/*/.bash_history")
+	EXCLUDES+=("--exclude=${TARGET}root/.bash_history")
 	EXCLUDES+=("--exclude=${TARGET}var/lib/connman/*")
 fi
 
diff --git a/tests/0001.bats b/tests/0001.bats
index 80b85c4..a8cc4d3 100644
--- a/tests/0001.bats
+++ b/tests/0001.bats
@@ -168,8 +168,8 @@ teardown() {
     assert_tar_includes test/var/log/portage/elog/.keep_sys-apps_portage-0
 }
 
-@test "/home/user/.bash_history is excluded" {
-    assert_tar_excludes test/home/user/.bash_history
+@test "/home/user/.bash_history is included" {
+    assert_tar_includes test/home/user/.bash_history
 }
 
 @test "/root/.bash_history is included" {
diff --git a/tests/0005.bats b/tests/0005.bats
index ee2e175..c198fe2 100644
--- a/tests/0005.bats
+++ b/tests/0005.bats
@@ -4,6 +4,8 @@ load test_helper
 
 setup() {
     f test/var/lib/connman/file
+    f test/root/.bash_history
+    f test/home/user/.bash_history
     mkstage4.sh -c -q -t test test
 }
 
@@ -19,4 +21,20 @@ teardown() {
     assert_tar_includes test/var/lib/connman/
 }
 
+@test "/home/user/.bash_history is exlucded" {
+    assert_tar_excludes test/home/user/.bash_history
+}
+
+@test "/home/user/ is included" {
+    assert_tar_includes test/home/user/
+}
+
+@test "/root/.bash_history is exlucded" {
+    assert_tar_excludes test/root/.bash_history
+}
+
+@test "/root/ is included" {
+    assert_tar_includes test/root/
+}
+
 # vim: ft=bash