Merge pull request #3 from 01rabbit/bug-fix

bug fix
01rabbit · Dec 25, 2019 · 8b0c2c8 · 8b0c2c8
2 parents 4682b11 + 24c8685
commit 8b0c2c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/modules/config_module.sh b/modules/config_module.sh
@@ -116,7 +116,7 @@ function config_manage()
                 read -n 1 -s ans
                 if [ $ans = 1 ];then
                     check_faraday
-                    tmux send-keys -t $SESSION_NAME.1 "$SCRIPT_DIR/$IMPORT $WDIR $WORKSPACE" C-m
+                    tmux send-keys -t $SESSION_NAME.1 "$INSTALL_DIR/$IMPORT $WDIR $WORKSPACE" C-m
                     tmux select-pane -t $SESSION_NAME.0
                     echo -e "Please check Faraday."
                     echo -e "Press any key to continue..."

diff --git a/modules/import-faraday.sh b/modules/import-faraday.sh
@@ -3,12 +3,12 @@ source source.conf
 # $1 Working Directory
 # $2 Faraday's Workspace name
 
-if [[ ! -d $WDIR/imported ]];then
-	mkdir -p $WDIR/imported
+if [[ ! -d $1/imported ]];then
+	mkdir -p $1/imported
 fi
 
-for i in `find $1 -name \*.xml -not -path "$WDIR/imported/*"`
+for i in `find $1 -name $1/\*.xml -not -path "$1/imported/*"`
 do
 	faraday-client --cli --workspace $2 --report $i
-	mv $i -t $WDIR/imported/
+	mv $i -t $1/imported/
 done