test

2021-04-13 13:10:55 +09:00 · 2021-04-13 13:10:55 +09:00 · 36d1293759
commit 36d1293759
parent 6ba75c93e4
6 changed files with 14 additions and 89 deletions
--- a/app/gitHash.js
+++ b/app/gitHash.js
@ -0,0 +1,6 @@
+const fs = require('fs')
+const execSync = require('child_process').execSync
+const gitHash = execSync('git rev-parse HEAD')
+    .toString()
+    .trim()
+fs.writeFileSync('git', gitHash)
--- a/app/package.json
+++ b/app/package.json
@ -7,9 +7,8 @@
    "main": "main.js",
    "scripts": {
        "test": "echo \"Error: no test specified\" && exit 1",
-        "preinstall": "only-allow yarn",
        "postinstall": "run-s util:*",
-        "util:hash": "echo $(git rev-parse HEAD) > git",
+        "util:hash": "node gitHash.js",
        "util:browserify": "browserify aiscript.js -o js/platform/aiscript.js",
        "construct": "node view/make/makeCli.js",
        "construct:store": "node view/make/makeCli.js --store",
@ -61,7 +60,7 @@
        "@fortawesome/fontawesome-free": "^5.15.2",
        "@syuilo/aiscript": "^0.11.1",
        "electron-dl": "^3.2.1",
-        "itunes-nowplaying-mac": "git://github.com/cutls/itunes-nowplaying-mac#48fb2970c57dca905a2669897cba82052a9f5a6a",
+        "itunes-nowplaying-mac": "git://github.com/cutls/itunes-nowplaying-mac#077a3c8fdac18d91048684698463f2478bd32683",
        "jimp": "^0.16.1",
        "jquery": "^3.6.0",
        "jquery-ui-dist": "^1.12.1",
@ -84,7 +83,6 @@
        "electron-rebuild": "^2.3.5",
        "eslint": "^7.23.0",
        "npm-run-all": "^4.1.5",
-        "only-allow": "^1.0.0",
        "readline-sync": "1.4.10",
        "ts-node": "^9.1.1",
        "typescript": "^4.2.4"
--- a/app/view/pl-PL/index.html
+++ b/app/view/pl-PL/index.html
@ -26,7 +26,7 @@
 <body class="">
 	<script>
 		var ver = '22.1.1 (Koume)'
-		var gitHash = 'ef8074b9cb2af6097ba520909b7b87efb7a15a29'
+		var gitHash = '6ba75c93e470f11690b39bf2902e81401c6b3eb4'
 		//betaを入れるとバージョンチェックしない
 		//var ver="beta";
 		var acct_id = 0
--- a/app/view/pl-PL/setting.html
+++ b/app/view/pl-PL/setting.html
@ -609,7 +609,7 @@
 		style="width:100%; max-width:40rem;"><img src="../../img/desk_full.svg" class="left" width="25"
 			style="padding-top:5px;">Main author: Cutls@cutls.com</a>
 	<br>
-	TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/ef8074b9cb2af6097ba520909b7b87efb7a15a29">ef8074b9cb2af6097ba520909b7b87efb7a15a29</a> - <a
+	TheDesk @ <a href="https://github.com/cutls/TheDesk/commits/6ba75c93e470f11690b39bf2902e81401c6b3eb4">6ba75c93e470f11690b39bf2902e81401c6b3eb4</a> - <a
 		onclick="checkupd(); return localStorage.removeItem('new-ver-skip'); location.href='index.html';"
 		class="pointer pwa">Sprawdź aktualizacje</a><br>
 	<br>
@ -619,7 +619,7 @@
 		<img src="https://status.cutls.com/badge-service?site=thedesk.top">
 	</a><br>
 	<h5>OSS License</h5>
-	<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/ef8074b9cb2af6097ba520909b7b87efb7a15a29"
+	<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fcutls%2FTheDesk/refs/branch/master/6ba75c93e470f11690b39bf2902e81401c6b3eb4"
 		alt="FOSSA Status"><img
 			src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcutls%2FTheDesk.svg?type=small" /></a>
 	<br>
--- a/app/yarn.lock
+++ b/app/yarn.lock
@ -881,20 +881,6 @@ boolean@^2.0.3:
  resolved "https://registry.yarnpkg.com/boolean/-/boolean-2.0.3.tgz#da4a5c5a85231d64dd4f6022a0fa5a66adc76653"
  integrity sha512-iHzXeFCXWrpjYE7DToXGCBPGZf0eVISqzL+4sgrOSYEKXnb59WHPFvGTTyCj6zJ/MuuLAxEn8zPkrTHHzlt3IA==

-boxen@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
-  integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==
-  dependencies:
-    ansi-align "^3.0.0"
-    camelcase "^5.3.1"
-    chalk "^3.0.0"
-    cli-boxes "^2.2.0"
-    string-width "^4.1.0"
-    term-size "^2.1.0"
-    type-fest "^0.8.1"
-    widest-line "^3.1.0"
-
 boxen@^5.0.0:
  version "5.0.0"
  resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.0.tgz#64fe9b16066af815f51057adcc800c3730120854"
@ -1197,11 +1183,6 @@ callsites@^3.0.0:
  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==

-camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
 camelcase@^6.2.0:
  version "6.2.0"
  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
@ -1229,14 +1210,6 @@ chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
    escape-string-regexp "^1.0.5"
    supports-color "^5.3.0"

-chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
-  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chalk@^4.0.0, chalk@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
@ -1293,7 +1266,7 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
    inherits "^2.0.1"
    safe-buffer "^5.0.1"

-cli-boxes@^2.2.0, cli-boxes@^2.2.1:
+cli-boxes@^2.2.1:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
@ -3134,9 +3107,9 @@ istextorbinary@^5.12.0:
    editions "^6.1.0"
    textextensions "^5.11.0"

-"itunes-nowplaying-mac@git://github.com/cutls/itunes-nowplaying-mac#48fb2970c57dca905a2669897cba82052a9f5a6a":
+"itunes-nowplaying-mac@git://github.com/cutls/itunes-nowplaying-mac#077a3c8fdac18d91048684698463f2478bd32683":
  version "0.4.0"
-  resolved "git://github.com/cutls/itunes-nowplaying-mac#48fb2970c57dca905a2669897cba82052a9f5a6a"
+  resolved "git://github.com/cutls/itunes-nowplaying-mac#077a3c8fdac18d91048684698463f2478bd32683"

 jake@^10.6.1:
  version "10.8.2"
@ -3852,14 +3825,6 @@ onetime@^5.1.0:
  dependencies:
    mimic-fn "^2.1.0"

-only-allow@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/only-allow/-/only-allow-1.0.0.tgz#1ac662a2ad77f6181240847481b6add201f4ef45"
-  integrity sha512-DQazysAz1cw8JxxYVqg+wXWSm6K7smVqORwS+dtXQWPeRwjsWvRpxMRa5FPiOPxH4e05xCDv12ncAUF8JlVukw==
-  dependencies:
-    boxen "^4.2.0"
-    which-pm-runs "^1.0.0"
-
 optionator@^0.9.1:
  version "0.9.1"
  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
@ -5036,11 +5001,6 @@ temp-file@^3.3.7:
    async-exit-hook "^2.0.1"
    fs-extra "^8.1.0"

-term-size@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
-  integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
-
 text-table@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@ -5394,11 +5354,6 @@ which-boxed-primitive@^1.0.2:
    is-string "^1.0.5"
    is-symbol "^1.0.3"

-which-pm-runs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
-  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
-
 which-typed-array@^1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.2.tgz#e5f98e56bda93e3dac196b01d47c1156679c00b2"
--- a/trial.travis.yml
+++ b/trial.travis.yml
@ -1,34 +0,0 @@
-os: windows
-language: node_js
-node_js:
- '10.15.2'
-script: node -v
-before_deploy:
-  - cd app
-  - npm install electron-builder -g
-  - npm install
-  - electron-builder --win --ia32
-  - mv ../build/TheDesk-setup.exe ../TheDesk-setup-ia32.exe
-  - mv ../build/TheDesk*.exe ../TheDesk-ia32.exe
-  - electron-builder --win --x64
-  - mv ../build/TheDesk-setup.exe ../TheDesk-setup.exe
-  - mv ../build/TheDesk*.exe ../TheDesk.exe
-  - cd ../
-  - ls
-after_deploy: ls
-deploy:
-  skip_cleanup: true
-  provider: releases
-  api_key:
-    secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
-  file: 
-    - TheDesk.exe
-    - TheDesk-setup.exe
-    - TheDesk-ia32.exe
-    - TheDesk-setup-ia32.exe
-  on:
-    repo: cutls/TheDesk
-branches:
-  only:
-  - master
-