diff --git a/file.ts b/file.ts index 3f3742be..f8ee20a7 100644 --- a/file.ts +++ b/file.ts @@ -342,147 +342,6 @@ const WEB_APP_FILE_LIST = [ ...CERTACCEPT_FILE_LIST, ]; - -//const WEB_APP_FILE_LIST = [ -// ...APP_FILE_LIST_SHARED_VENDORS, -// { /* shared html and php files */ -// "type": "html", -// "search-pattern": /^.*([a-zA-Z]+)\.(html|php|json)$/, -// "build-target": "dev|rel", -// -// "path": "./", -// "local-path": "./shared/html/" -// }, -// { /* javascript files as manifest.json */ -// "type": "js", -// "search-pattern": /.*$/, -// "build-target": "dev|rel", -// -// "path": "js/", -// "local-path": "./dist/" -// }, -// { /* loader javascript file */ -// "type": "js", -// "search-pattern": /.*$/, -// "build-target": "dev|rel", -// -// "path": "js/", -// "local-path": "./loader/dist/" -// }, -// { /* shared developer single css files */ -// "type": "css", -// "search-pattern": /.*\.css$/, -// "build-target": "dev", -// -// "path": "css/", -// "local-path": "./shared/css/" -// }, -// { /* shared css mapping files (development mode only) */ -// "type": "css", -// "search-pattern": /.*\.(css.map|scss)$/, -// "build-target": "dev", -// -// "path": "css/", -// "local-path": "./shared/css/", -// "req-parm": ["--mappings"] -// }, -// { /* shared release css files */ -// "type": "css", -// "search-pattern": /.*\.css$/, -// "build-target": "rel", -// -// "path": "css/", -// "local-path": "./shared/generated/" -// }, -// { /* shared release css files */ -// "type": "css", -// "search-pattern": /.*\.css$/, -// "build-target": "rel", -// -// "path": "css/loader/", -// "local-path": "./shared/css/loader/" -// }, -// { /* shared release css files */ -// "type": "css", -// "search-pattern": /.*\.css$/, -// "build-target": "dev|rel", -// -// "path": "css/theme/", -// "local-path": "./shared/css/theme/" -// }, -// { /* shared sound files */ -// "type": "wav", -// "search-pattern": /.*\.wav$/, -// "build-target": "dev|rel", -// -// "path": "audio/", -// "local-path": "./shared/audio/" -// }, -// { /* shared data sound files */ -// "type": "json", -// "search-pattern": /.*\.json/, -// "build-target": "dev|rel", -// -// "path": "audio/", -// "local-path": "./shared/audio/" -// }, -// { /* shared image files */ -// "type": "img", -// "search-pattern": /.*\.(svg|png)/, -// "build-target": "dev|rel", -// -// "path": "img/", -// "local-path": "./shared/img/" -// }, -// { /* own webassembly files */ -// "type": "wasm", -// "search-pattern": /.*\.(wasm)/, -// "build-target": "dev|rel", -// -// "path": "wat/", -// "local-path": "./shared/wat/" -// }, -// -// -// /* web specific */ -// { /* generated assembly files */ -// "web-only": true, -// "type": "wasm", -// "search-pattern": /.*\.(wasm)/, -// "build-target": "dev|rel", -// -// "path": "wasm/", -// "local-path": "./asm/generated/" -// }, -// { /* web css files */ -// "web-only": true, -// "type": "css", -// "search-pattern": /.*\.css$/, -// "build-target": "dev|rel", -// -// "path": "css/", -// "local-path": "./web/css/" -// }, -// { /* web html files */ -// "web-only": true, -// "type": "html", -// "search-pattern": /.*\.(php|html)/, -// "build-target": "dev|rel", -// -// "path": "./", -// "local-path": "./web/html/" -// }, -// { /* translations */ -// "web-only": true, /* Only required for the web client */ -// "type": "i18n", -// "search-pattern": /.*\.(translation|json)/, -// "build-target": "dev|rel", -// -// "path": "i18n/", -// "local-path": "./shared/i18n/" -// } -//] as any; - //@ts-ignore declare module "fs-extra" { export function exists(path: PathLike): Promise; diff --git a/package.json b/package.json index 8ce13420..8e9c4171 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "main.js", "directories": {}, "scripts": { - "compile-sass": "sass --update shared/css/:shared/css/ web/css/:web/css/ client/css/:client/css/", + "compile-sass": "sass --update shared/css/:shared/css/ web/css/:web/css/ client/css/:client/css/ vendor/:vendor/", "compile-project-base": "tsc -p tsbaseconfig.json", "dtsgen": "node tools/dtsgen/index.js", "trgen": "node tools/trgen/index.js", diff --git a/scripts/travis_deploy.sh b/scripts/travis_deploy.sh index 4258f5d5..168f284a 100644 --- a/scripts/travis_deploy.sh +++ b/scripts/travis_deploy.sh @@ -26,11 +26,12 @@ if [[ ! -x ${GIT_RELEASE_EXECUTABLE} ]]; then exit 1 } - gunzip /tmp/git-release.gz && chmod +x /tmp/git-release; - [[ $? -eq 0 ]] || { + gunzip /tmp/git-release.gz; _exit_code=$?; + [[ $_exit_code -eq 0 ]] || { echo "Failed to unzip github-release-linux" exit 1 } + chmod +x /tmp/git-release; echo "Download of github-release-linux (1.2.4) finished" else