diff --git a/benchmark/gemm/run.sh b/benchmark/gemm/run.sh
index 4452ca479124203b951bb9e480b789f0baa88287..0c9649b69f44857ec17102cf225545892a9e8ccb 100644
--- a/benchmark/gemm/run.sh
+++ b/benchmark/gemm/run.sh
@@ -23,8 +23,8 @@ x86Run(){
     ${mpi_cmd} ./gemm 4024 4024 4024 0
 }
 # check Arch
-if [ x$(arch) = xaarch64 ];then
+if [ x"$(arch)" = xaarch64 ];then
     armRun
 else
     x86Run
-fi
\ No newline at end of file
+fi
diff --git a/benchmark/omp/run.sh b/benchmark/omp/run.sh
index 3784d96de306443521a0c6fb52abe11e6cc122f9..440cdb73eb665638f2fedb2e5cb88543106ccd9d 100644
--- a/benchmark/omp/run.sh
+++ b/benchmark/omp/run.sh
@@ -11,8 +11,8 @@ x86Run(){
     armRun
 }
 # check Arch
-if [ x$(arch) = xaarch64 ];then
+if [ x"$(arch)" = xaarch64 ];then
     armRun
 else
     x86Run
-fi
\ No newline at end of file
+fi
diff --git a/benchmark/p2p/run.sh b/benchmark/p2p/run.sh
index 71843daee87308c00df12d2a3b3ab73f0e196913..d7c966f22cd0ac32e1e4b625910302a2e0835169 100644
--- a/benchmark/p2p/run.sh
+++ b/benchmark/p2p/run.sh
@@ -9,8 +9,8 @@ x86Run(){
     armRun
 }
 # check Arch
-if [ x$(arch) = xaarch64 ];then
+if [ x"$(arch)" = xaarch64 ];then
     armRun
 else
     x86Run
-fi
\ No newline at end of file
+fi
diff --git a/init.sh b/init.sh
index 0ab26130b717374ac84ed275acfdb9619d7782a3..6062a6ea6656540762bfc491152b6789d68592c4 100644
--- a/init.sh
+++ b/init.sh
@@ -2,7 +2,7 @@ CUR_PATH=$(pwd)
 chmod -R +x ./benchmark
 chmod -R +x ./package
 chmod -R +x ./test
-chmod +x *.sh
+chmod +x ./*.sh
 chmod +x jarvis
 mkdir -p tmp
 export JARVIS_ROOT=${CUR_PATH}
@@ -16,5 +16,5 @@ export DOWNLOAD_TOOL=${CUR_PATH}/package/common/download.sh
 #Install modules
 if ! type module >/dev/null 2>&1;then
     echo "Install environment-modules"
-    yum install -y environment-modules
+    yum install -y environment-modules || apt install -y environment-modules
 fi
diff --git a/jarvis b/jarvis
index b6443c5ecf22b55ab756c25a4fb581d536655f69..c2f35a4b9369e70c64e21328e96bb31ce831e56f 100644
--- a/jarvis
+++ b/jarvis
@@ -1,2 +1,4 @@
 #!/bin/bash
-python3 ./src/jarvis.py $*
\ No newline at end of file
+#python3 ./src/jarvis.py $*
+#prevent whitespace problems
+python3 ./src/jarvis.py "$@"