diff --git a/back/api/script.ts b/back/api/script.ts index ce85d2f8..2e418e5c 100644 --- a/back/api/script.ts +++ b/back/api/script.ts @@ -43,7 +43,7 @@ export default (app: Router) => { children.push({ title: childFile, value: childFile, - key: childFile, + key: `${fileOrDir}-${childFile}`, mtime: statObj.mtimeMs, parent: fileOrDir, }); diff --git a/shell/task.sh b/shell/task.sh index 2349c344..708133e7 100755 --- a/shell/task.sh +++ b/shell/task.sh @@ -106,7 +106,7 @@ run_normal() { cd $dir_scripts local relative_path="${first_param%/*}" - if [[ ! -z ${relative_path} ]]; then + if [[ ! -z ${relative_path} ]] && [[ ${first_param} =~ "/" ]]; then cd ${relative_path} first_param=${first_param/$relative_path\//} fi @@ -174,7 +174,7 @@ run_concurrent() { cd $dir_scripts local relative_path="${first_param%/*}" - if [[ ! -z ${relative_path} ]]; then + if [[ ! -z ${relative_path} ]] && [[ ${first_param} =~ "/" ]]; then cd ${relative_path} first_param=${first_param/$relative_path\//} fi @@ -248,7 +248,7 @@ run_designated() { cd $dir_scripts local relative_path="${file_param%/*}" - if [[ ! -z ${relative_path} ]]; then + if [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then cd ${relative_path} file_param=${file_param/$relative_path\//} fi