Addressing PR comments (shellcheck)

Author: Andras Fekete

scripts/test-openssl.sh

@@ -281,18 +281,18 @@ printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
 # Set up wolfProvider
 cd ${WOLFPROV_DIR}
 if [ ! -e "${WOLFPROV_DIR}/configure" ]; then
-    ./autogen.sh 2>&1 >> $LOG_FILE
-    ./configure --with-openssl=${OPENSSL_INSTALL_DIR} --with-wolfssl=${WOLFSSL_INSTALL_DIR} 2>&1 >> $LOG_FILE
+    ./autogen.sh >>$LOG_FILE 2>&1
+    ./configure --with-openssl=${OPENSSL_INSTALL_DIR} --with-wolfssl=${WOLFSSL_INSTALL_DIR} >>$LOG_FILE 2>&1
 fi
-make -j$NUMCPU 2>&1 >> $LOG_FILE
+make -j$NUMCPU >>$LOG_FILE 2>&1
 if [ $? != 0 ]; then
   printf "\n\n...\n"
   tail -n 40 $LOG_FILE
   do_cleanup
   exit 1
 fi
 
-make test 2>&1 >> $LOG_FILE
+make test >>$LOG_FILE 2>&1
 if [ $? != 0 ]; then
   printf "\n\n...\n"
   tail -n 40 $LOG_FILE

scripts/test-wp-cs.sh

@@ -45,7 +45,7 @@ check_process_running() {
 kill_servers() {
     if [ "$OPENSSL_SERVER_PID" != "-1" ]; then
         if [ $(check_process_running $OPENSSL_SERVER_PID) = "0" ]; then
-            kill -9 $OPENSSL_SERVER_PID 2>&1 >/dev/null
+            kill -9 $OPENSSL_SERVER_PID >/dev/null 2>&1
             sleep 0.1 # make sure there's time for them to die
         fi
         OPENSSL_SERVER_PID=-1
@@ -250,10 +250,10 @@ printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
 # Set up wolfProvider
 cd ${WOLFPROV_DIR}
 if [ ! -e "${WOLFPROV_DIR}/configure" ]; then
-    ./autogen.sh 2>&1 >> $LOG_FILE
-    ./configure --with-openssl=${OPENSSL_INSTALL_DIR} --with-wolfssl=${WOLFSSL_INSTALL_DIR} 2>&1 >> $LOG_FILE
+    ./autogen.sh >>$LOG_FILE 2>&1
+    ./configure --with-openssl=${OPENSSL_INSTALL_DIR} --with-wolfssl=${WOLFSSL_INSTALL_DIR} >>$LOG_FILE 2>&1
 fi
-make -j$NUMCPU 2>&1 >> $LOG_FILE
+make -j$NUMCPU >>$LOG_FILE 2>&1
 if [ $? != 0 ]; then
   printf "\n\n...\n"
   tail -n 40 $LOG_FILE
@@ -270,7 +270,7 @@ if [ "${AM_BWRAPPED-}" != "yes" ]; then
     unset AM_BWRAPPED
 fi
 
-make test 2>&1 >> $LOG_FILE
+make test >>$LOG_FILE 2>&1
 if [ $? != 0 ]; then
   printf "\n\n...\n"
   tail -n 40 $LOG_FILE

scripts/utils-openssl.sh

@@ -41,7 +41,7 @@ install_openssl() {
     if [ ! -d ${OPENSSL_SOURCE_DIR} ]; then
         printf "\tClone OpenSSL ${OPENSSL_TAG} ... "
         git clone --depth=1 -b ${OPENSSL_TAG} ${OPENSSL_GIT} \
-             ${OPENSSL_SOURCE_DIR} 2>&1 >> $LOG_FILE
+             ${OPENSSL_SOURCE_DIR} >>$LOG_FILE 2>&1
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             do_cleanup
@@ -54,7 +54,7 @@ install_openssl() {
 
     if [ ! -d ${OPENSSL_INSTALL_DIR} ]; then
         printf "\tConfigure OpenSSL ${OPENSSL_TAG} ... "
-        ./config shared --prefix=${OPENSSL_INSTALL_DIR} 2>&1 >> $LOG_FILE
+        ./config shared --prefix=${OPENSSL_INSTALL_DIR} >>$LOG_FILE 2>&1
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             rm -rf ${OPENSSL_INSTALL_DIR}
@@ -64,7 +64,7 @@ install_openssl() {
         printf "Done.\n"
 
         printf "\tBuild OpenSSL ${OPENSSL_TAG} ... "
-        make -j$NUMCPU 2>&1 >> $LOG_FILE
+        make -j$NUMCPU >>$LOG_FILE 2>&1
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             rm -rf ${OPENSSL_INSTALL_DIR}
@@ -74,7 +74,7 @@ install_openssl() {
         printf "Done.\n"
 
         printf "\tInstalling OpenSSL ${OPENSSL_TAG} ... "
-        make -j$NUMCPU install 2>&1 >> $LOG_FILE
+        make -j$NUMCPU install >>$LOG_FILE 2>&1
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             rm -rf ${OPENSSL_INSTALL_DIR}

scripts/utils-wolfssl.sh

@@ -42,7 +42,7 @@ install_wolfssl() {
     if [ ! -d ${WOLFSSL_SOURCE_DIR} ]; then
         printf "\tClone wolfSSL ${WOLFSSL_TAG} ... "
         git clone --depth=1 -b ${WOLFSSL_TAG} ${WOLFSSL_GIT} \
-             ${WOLFSSL_SOURCE_DIR} 2>&1 >> $LOG_FILE
+             ${WOLFSSL_SOURCE_DIR} >>$LOG_FILE 2>&1
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             do_cleanup
@@ -60,8 +60,8 @@ install_wolfssl() {
             WOLFSSL_CONFIG_CPPFLAGS=CPPFLAGS="-I${OPENSSL_INSTALL_DIR} -DHAVE_AES_ECB -DWOLFSSL_AES_DIRECT -DWC_RSA_NO_PADDING -DWOLFSSL_PUBLIC_MP -DECC_MIN_KEY_SZ=192 -DHAVE_PUBLIC_FFDHE -DHAVE_FFDHE_6144 -DHAVE_FFDHE_8192 -DFP_MAX_BITS=16384 -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_PSS_SALT_LEN_DISCOVER"
         fi
 
-        ./autogen.sh 2>&1 >> $LOG_FILE
-        ./configure ${WOLFSSL_CONFIG_OPTS} "${WOLFSSL_CONFIG_CPPFLAGS}" -prefix=${WOLFSSL_INSTALL_DIR} 2>&1 >> $LOG_FILE
+        ./autogen.sh >>$LOG_FILE 2>&1
+        ./configure ${WOLFSSL_CONFIG_OPTS} "${WOLFSSL_CONFIG_CPPFLAGS}" -prefix=${WOLFSSL_INSTALL_DIR} >>$LOG_FILE 2>&1
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             rm -rf ${WOLFSSL_INSTALL_DIR}
@@ -71,7 +71,7 @@ install_wolfssl() {
         printf "Done.\n"
 
         printf "\tBuild wolfSSL ${WOLFSSL_TAG} ... "
-        make -j$NUMCPU 2>&1 >> $LOG_FILE
+        make -j$NUMCPU >>$LOG_FILE 2>&1
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             rm -rf ${WOLFSSL_INSTALL_DIR}
@@ -81,7 +81,7 @@ install_wolfssl() {
         printf "Done.\n"
 
         printf "\tInstalling wolfSSL ${WOLFSSL_TAG} ... "
-        make -j$NUMCPU install 2>&1 >> $LOG_FILE
+        make -j$NUMCPU install >>$LOG_FILE 2>&1
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             rm -rf ${WOLFSSL_INSTALL_DIR}