Correct handling of missing .bash_history

Signed-off-by: Martyn Welch martyn.welch@collabora.co.uk

run-aa-test

@@ -60,8 +60,9 @@ TEST_TITLE=$( basename ${EXPECT_FILE} )
 # Touch .bash_history, which we use in some tests, if it's not there.
 bash_history="/home/${CHAIWALA_USER}/.bash_history"
 if [ ! -r ${bash_history} ]; then
-	RET=$( sudo -u ${CHAIWALA_USER} touch ${bash_history} )
-	if [ $RET != 0 ]; then
+	sudo -u ${CHAIWALA_USER} touch ${bash_history}
+	RET=$?
+	if [ "$RET" != "0" ]; then
 		echo "Failed to create .bash_history: $RET"
 		exit 1
 	fi

[Andrej Shadura]

Or you could just write:

if ! sudo -u ${CHAIWALA_USER} touch ${bash_history}
then
    …
fi

[Martyn Welch]

If I do that, then line 66 becomes problematic...

[Andrej Shadura]

Oh, indeed