Skip to contentSkip to conversation

su01: do pre-checking to avoid annoying warning

PATCH New Ning 2 participants 2 messages Dec 16, 2016 – Jan 18, 2017

lore
Share & tools
lore

Ning

#0 lore raw

PATCH 1/1 su01: do pre-checking to avoid annoying warning

From: Ning Han <[email protected]>

Signed-off-by Ning Han <[email protected]>
---
 testcases/commands/su/su01 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
testcases/commands/su/su01 +4 -4
index dd1517f..41441de 100755
@@ -86,7 +86,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
 #Create 1st test user
     #erase user if he may exist , so we can have a clean en
         rm -rf /home/$TEST_USER1
-        userdel $TEST_USER1
+        getent passwd $TEST_USER1 &> /dev/null && userdel $TEST_USER1
 	sleep 1
 
         useradd -m -g users $TEST_USER1

@@ -105,7 +105,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
 	then {
           USER_UID=`id -u $TEST_USER1`
           USER_GID=`id -g $TEST_USER1`
-          mkdir $TEST_USER1_HOMEDIR
+          mkdir -p $TEST_USER1_HOMEDIR
           chown -R $USER_UID.$USER_GID $TEST_USER1_HOMEDIR
 	}
 	fi

@@ -121,7 +121,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
 #Create 2nd test user
 	#erase user if he may exist , so we can have a clean en
         rm -rf /home/$TEST_USER2
-        userdel $TEST_USER2
+        getent passwd $TEST_USER2 &> /dev/null && userdel $TEST_USER2
 	sleep 1
 
         useradd -m -g users $TEST_USER2

@@ -141,7 +141,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
         then {
           USER_UID=`id -u $TEST_USER2`
           USER_GID=`id -g $TEST_USER2`
-          mkdir $TEST_USER2_HOMEDIR
+          mkdir -p $TEST_USER2_HOMEDIR
           chown -R $USER_UID.$USER_GID $TEST_USER2_HOMEDIR
 	}
 	fi
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 su01: do pre-checking to avoid annoying warning

Hi!

Quoted 9 lines
---
 testcases/commands/su/su01 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
testcases/commands/su/su01 +0 -0
index dd1517f..41441de 100755

testcases/commands/su/su01 rm -f $TEST_ENV_FILE > /dev/null 2>&1 · line 89

Quoted 5 lines
testcases/commands/su/su01 +1 -1
@@ -86,7 +86,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
 #Create 1st test user
     #erase user if he may exist , so we can have a clean en
         rm -rf /home/$TEST_USER1
-        userdel $TEST_USER1
+        getent passwd $TEST_USER1 &> /dev/null && userdel $TEST_USER1

^
This is a bashism, portable way to redirect both streams is > /dev/null 2>&1

Upon closer look I've found and fixed two cases of bashism and pushed, thanks.

Signature · 2 lines
Cyril Hrubis
[email protected]