fixed bug in batchmode of stk_inspect and updated bundle.sh (#117)

jredmondson · Oct 8, 2018 · 50fdc63 · 50fdc63
1 parent 219132d
commit 50fdc63
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scripts/linux/bundle.sh b/scripts/linux/bundle.sh
@@ -156,8 +156,8 @@ else
 
   IFS=" "
 
-  echo "mabundle -d ${DEST_DIR} -s ${SOURCE_DIR} ${BUNDLE_ARGS[@]}"
-  mabundle -d ${DEST_DIR} -s ${SOURCE_DIR} "${BUNDLE_ARGS[@]}"
+  echo "\$MADARA_ROOT/bin/mabundle -d ${DEST_DIR} -s ${SOURCE_DIR} ${BUNDLE_ARGS[@]}"
+  $MADARA_ROOT/bin/mabundle -d ${DEST_DIR} -s ${SOURCE_DIR} "${BUNDLE_ARGS[@]}"
 
   if [ $TAR -eq 1 ]; then
 

diff --git a/tools/stk_inspect.cpp b/tools/stk_inspect.cpp
@@ -600,7 +600,7 @@ void handle_arguments(int argc, const char** argv, size_t recursion_limit = 10)
 
       ++i;
     }
-    if(arg1 == "-cf" || arg1 == "--config-file")
+    else if(arg1 == "-cf" || arg1 == "--config-file")
     {
       madara_logger_ptr_log(logger::global_logger.get(), logger::LOG_TRACE,
           "Found user config file flag, param: %s\n", argv[i + 1]);