Merge ~bladernr/plainbox-provider-certification-server:precheck-sid-recheck into plainbox-provider-certification-server:master

[Jeff Lane ]

Modified the SecureID check to now validate existing or newly entered SIDs

[Pierre Equoy (pieq)]

line 94 of the script you have the following:

    echo " secure_id is configured as $secureid Is this correct? [Y/n]"

If the $secureid is empty, you end up with this displayed on screen:

 secure_id is configured as Is this correct? [Y/n]

I find that a bit confusing.

Maybe using the following would be better:

    echo " secure_id is configured as '$secureid'.\n Is this correct? [Y/n]"

review: Needs Fixing

[Pierre Equoy (pieq)]

As Sam pointed out to me, my suggestion should be:

echo -e " secure_id is configured as '$secureid'.\n Is this correct? [Y/n]"

(added '-e'. I'm using zsh and when I tried in my term I didn't need the '-e')

[Jeff Lane  (bladernr)]

It seems that the preference in the "world" is to use printf in favor of echo, but I'm not going to go through and change all that right now. Maybe later (though I think this is big enough that it really needs to be converted to a Python tool at this point).

Anyway, I've changed it with Echo statements to match what Pierre suggested.

review: Needs Resubmitting

[Pierre Equoy (pieq)]

+1

review: Approve

diff --git a/tools/canonical-certification-precheck b/tools/canonical-certification-precheck
index 829abf1..46190c5 100755
--- a/tools/canonical-certification-precheck
+++ b/tools/canonical-certification-precheck
@@ -74,22 +74,38 @@ fi
 }
 
 # Secure ID is set in /etc/xdg/canonical-certification.conf (?)
+configure_SID(){
+    read -e -p " Please enter the secure_id of your SUT: " sid 
+    if grep "#secure_id" /etc/xdg/canonical-certification.conf >/dev/null ; then
+        sudo sed -i "s/#\[transport:c3\]/\[transport:c3\]/g" /etc/xdg/canonical-certification.conf
+	    sudo sed -i "s/#secure_id =.*/secure_id = $sid/g" /etc/xdg/canonical-certification.conf
+    else
+	    sudo sed -i "s/secure_id =.*/secure_id = $sid/g" /etc/xdg/canonical-certification.conf
+    fi
+}
+
+
 SID_Check(){
 name="Secure ID Check"
 echoname
 #if [ -n $secureid ];then
 if grep "^secure_id =" /etc/xdg/canonical-certification.conf >/dev/null ; then
 	secureid=$(grep "^secure_id =" /etc/xdg/canonical-certification.conf|awk '{print $3}')
-        echo " secure_id is configured as $secureid"
-	eval info${i}=\"$secureid\"
+    echo " Secure ID is configured as '$secureid'."
+    echo " Is this correct? [Y/n]"
+    read -s -N1 a
+    if [[ $a == "n" || $a == "N" ]]; then
+        configure_SID
+        SID_Check
+    else
+	    eval info${i}=\"$secureid\"
         info
+    fi
 else
     echo -e " secure_id is not configured.\n Would you like to configure it now? [Y/n]"
     read -s -N1 a
     if [[ $a == "Y" || $a == "y" || -z $a ]]; then
-        read -e -p " Please enter the secure_id of your SUT: " sid 
-        sudo sed -i "s/#\[transport:c3\]/\[transport:c3\]/g" /etc/xdg/canonical-certification.conf
-	    sudo sed -i "s/#secure_id =.*/secure_id = $sid/g" /etc/xdg/canonical-certification.conf
+        configure_SID
 	    SID_Check
     elif [[ $a == "N" || $a == "n" ]]; then
 		eval info${i}=\"Not Set\"