diff --git a/env_loc.js b/env_loc.js index c73e1ac..5daf9dc 100644 --- a/env_loc.js +++ b/env_loc.js @@ -21,12 +21,10 @@ const defaultEnv = { : '', simsimPath: module.paths.some((modulesPath) => fs.existsSync(path.join(modulesPath, 'simsim_key'))) ? 'simsim_key' - : fs.existsSync('../../../simsim_key') - ? path.resolve('../../../simsim_key') : fs.existsSync(`${os.homedir()}/simsim_key`) ? path.resolve(`${os.homedir()}/simsim_key`) : '', - openShare: fs.existsSync('../../npm') ? path.resolve('../../npm') : fs.existsSync(`${os.homedir()}/opx`) ? path.resolve(`${os.homedir()}/opx`) : '', + openShare: fs.existsSync('../../opx') ? path.resolve('../../opx') : fs.existsSync(`${os.homedir()}/opx`) ? path.resolve(`${os.homedir()}/opx`) : '', } const paramDefaults = params.reduce((acc, cur) => { diff --git a/gitignore_merge.js b/gitignore_merge.js index 86c07ee..07a7f94 100644 --- a/gitignore_merge.js +++ b/gitignore_merge.js @@ -5,7 +5,7 @@ const path = require('path') console.log('\n::*** Merge remote and local gitignore files to .gitignore') // 下载远程 .gitignore_global 内容,不保存中间文件 -const remoteUrl = 'https://git.tic.cc/open/sysconfig/raw/branch/main/nixhome/.gitignore_global' +const remoteUrl = 'https://git.tic.cc/opx/sysconfig/raw/branch/main/nixhome/.gitignore_global' console.log('::--- fetching remote file:', remoteUrl) https .get(remoteUrl, (res) => { diff --git a/gitignore_merge.sh b/gitignore_merge.sh index 98e0686..54bb1db 100755 --- a/gitignore_merge.sh +++ b/gitignore_merge.sh @@ -1,9 +1,9 @@ #!/bin/bash echo ::*** Merge remote [.gitignore_global] and local [.gitignore.local.txt] to [.gitignore] -curl -sSL https://git.tic.cc/open/sysconfig/raw/branch/main/nixhome/.gitignore_global > .gitignore +curl -sSL https://git.tic.cc/opx/sysconfig/raw/branch/main/nixhome/.gitignore_global > .gitignore if [ -f .gitignore.local.txt ]; then cat .gitignore.local.txt >> .gitignore; fi; echo # usage in package.json: -# "to_merge_gitignore.sh": "curl -sSL https://git.tic.cc/open/sysconfig/raw/branch/main/gitignore_merge.sh | bash", \ No newline at end of file +# "to_merge_gitignore.sh": "curl -sSL https://git.tic.cc/opx/sysconfig/raw/branch/main/gitignore_merge.sh | bash", \ No newline at end of file diff --git a/package.json b/package.json index a7d7c9a..ea4e2e6 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "app_versioning.js", "repository": { "type": "git", - "url": "https://git.tic.cc/open/wo_scripts" + "url": "https://git.tic.cc/opx/wo_scripts" }, "keywords": [], "author": "", diff --git a/seafile-ignore.txt b/seafile-ignore.txt index d0a7486..c7c0ec5 100644 --- a/seafile-ignore.txt +++ b/seafile-ignore.txt @@ -27,9 +27,11 @@ FETCH_HEAD */FETCH_HEAD .Trash/ +.Trashes/ .DS_Store */.DS_Store +*.aae # AAE 文件主要在苹果的照片应用程序中使用,保存对原始照片所做的编辑,比如,裁剪、旋转或调整亮度等操作的信息。 .thumbnails */.thumbnails