u
This commit is contained in:
@@ -21,12 +21,10 @@ const defaultEnv = {
|
|||||||
: '',
|
: '',
|
||||||
simsimPath: module.paths.some((modulesPath) => fs.existsSync(path.join(modulesPath, 'simsim_key')))
|
simsimPath: module.paths.some((modulesPath) => fs.existsSync(path.join(modulesPath, 'simsim_key')))
|
||||||
? 'simsim_key'
|
? 'simsim_key'
|
||||||
: fs.existsSync('../../../simsim_key')
|
|
||||||
? path.resolve('../../../simsim_key')
|
|
||||||
: fs.existsSync(`${os.homedir()}/simsim_key`)
|
: fs.existsSync(`${os.homedir()}/simsim_key`)
|
||||||
? path.resolve(`${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) => {
|
const paramDefaults = params.reduce((acc, cur) => {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ const path = require('path')
|
|||||||
console.log('\n::*** Merge remote and local gitignore files to .gitignore')
|
console.log('\n::*** Merge remote and local gitignore files to .gitignore')
|
||||||
|
|
||||||
// 下载远程 .gitignore_global 内容,不保存中间文件
|
// 下载远程 .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)
|
console.log('::--- fetching remote file:', remoteUrl)
|
||||||
https
|
https
|
||||||
.get(remoteUrl, (res) => {
|
.get(remoteUrl, (res) => {
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
echo ::*** Merge remote [.gitignore_global] and local [.gitignore.local.txt] to [.gitignore]
|
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;
|
if [ -f .gitignore.local.txt ]; then cat .gitignore.local.txt >> .gitignore; fi;
|
||||||
echo
|
echo
|
||||||
|
|
||||||
# usage in package.json:
|
# usage in package.json:
|
||||||
# "to_merge_gitignore.sh": "curl -sSL https://git.tic.cc/open/sysconfig/raw/branch/main/gitignore_merge.sh | bash",
|
# "to_merge_gitignore.sh": "curl -sSL https://git.tic.cc/opx/sysconfig/raw/branch/main/gitignore_merge.sh | bash",
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
"main": "app_versioning.js",
|
"main": "app_versioning.js",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.tic.cc/open/wo_scripts"
|
"url": "https://git.tic.cc/opx/wo_scripts"
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
|
|||||||
@@ -27,9 +27,11 @@ FETCH_HEAD
|
|||||||
*/FETCH_HEAD
|
*/FETCH_HEAD
|
||||||
|
|
||||||
.Trash/
|
.Trash/
|
||||||
|
.Trashes/
|
||||||
|
|
||||||
.DS_Store
|
.DS_Store
|
||||||
*/.DS_Store
|
*/.DS_Store
|
||||||
|
*.aae # AAE 文件主要在苹果的照片应用程序中使用,保存对原始照片所做的编辑,比如,裁剪、旋转或调整亮度等操作的信息。
|
||||||
|
|
||||||
.thumbnails
|
.thumbnails
|
||||||
*/.thumbnails
|
*/.thumbnails
|
||||||
|
|||||||
Reference in New Issue
Block a user