From 6300374281888b2f738f719e057b5e74db9706f5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 5 Nov 2007 18:43:39 -0500
Subject: polish

---
 pre-apt.d/50uncommitted-changes | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'pre-apt.d/50uncommitted-changes')

diff --git a/pre-apt.d/50uncommitted-changes b/pre-apt.d/50uncommitted-changes
index 5a198ef..c8e4736 100755
--- a/pre-apt.d/50uncommitted-changes
+++ b/pre-apt.d/50uncommitted-changes
@@ -1,15 +1,15 @@
 #!/bin/sh
 set -e
-while git-status || ! LANG=C git-status 2>&1 | grep -q "working directory clean"
-do
-	echo "etckeeper warning: /etc has uncommitted changes" >&2
-	printf "Press Enter to commit these changes and continue. "
-	read line
+if ! LANG=C git-status 2>&1 | grep -q "working directory clean"; then
+	git-status || true
+	echo "etckeeper warning: /etc is not clean" >&2
+	printf "Press Enter to commit changes and continue. "
+	read line </dev/tty
 	git add .
 	if ! git commit -m "saving uncommitted changes in /etc prior to apt run"; then
 		echo "etckeeper warning: git commit failed" >&2
 		echo "Please resolve the uncommitted changes by hand."
 		printf "Press Enter when ready to continue. "
-		read line
+		read line </dev/tty
 	fi
-done
+fi
-- 
cgit v1.2.3