From f8e6f63e49b331b90b89c5319442a54c116d239d Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 3 Jun 2019 12:15:02 -0400
Subject: [PATCH] Clean up shell folder, and take the / out of the variable

---
 xCAT-test/autotest/testcase/genesis/test.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xCAT-test/autotest/testcase/genesis/test.sh b/xCAT-test/autotest/testcase/genesis/test.sh
index b16abb4bc..a5a7dc524 100755
--- a/xCAT-test/autotest/testcase/genesis/test.sh
+++ b/xCAT-test/autotest/testcase/genesis/test.sh
@@ -63,8 +63,8 @@ function check_destiny() {
         runcmd $cmd;
         cmd="ifconfig $NET2 $NET2IP";
         runcmd $cmd;
-        echo "Check if 'nodeset ${TESTNODE} shell' is added to $SHELLFOLDER"
-        cat "$SHELLFOLDER"${TESTNODE} |grep "xcatd=${MASTER_PRIVATE_IP}:3001 destiny=shell";
+        echo "Check if 'nodeset ${TESTNODE} shell' is added to ${SHELLFOLDER}/${TESTNODE}"
+        cat "${SHELLFOLDER}/${TESTNODE}" |grep "xcatd=${MASTER_PRIVATE_IP}:3001 destiny=shell";
         if [[ $? -eq 0 ]] ;then
             return 0;
         else
@@ -92,11 +92,11 @@ while [ "$#" -ge "0" ]; do
         "--check" )
         NETBOOT=$2;
         if [[ $NETBOOT =~ petitboot ]];then
-            SHELLFOLDER="/tftpboot/petitboot/";
+            SHELLFOLDER="/tftpboot/petitboot";
         elif [[ $NETBOOT =~  xnba ]];then
-            SHELLFOLDER="/tftpboot/xcat/xnba/nodes/"
+            SHELLFOLDER="/tftpboot/xcat/xnba/nodes"
         else
-            SHELLFOLDER="/tftpboot/boot/grub2/";
+            SHELLFOLDER="/tftpboot/boot/grub2";
         fi
         check_destiny ;
         if [[ $? -eq 1 ]];then