From 28f2e9302a6f0fd6f3c986f701261db6d8cf0bd6 Mon Sep 17 00:00:00 2001
From: cutls <cutls>
Date: Mon, 28 Jan 2019 02:40:15 +0900
Subject: [PATCH] git bash

---
 .travis.yml      | 21 ++++++++++-----------
 app/package.json |  3 ++-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 06bf0432..d7805acd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ os: windows
 language: node_js
 node_js:
 - '9.9.0'
-script: node -v
+script: 7z a
 before_deploy:
   - cd app
   - npm install electron -g
@@ -13,11 +13,11 @@ before_deploy:
   - npm install --save-dev electron-rebuild
   - .\\node_modules\\.bin\\electron-rebuild.cmd
   - electron-builder --win --ia32
-  - move "..\\build\\TheDesk *.*.*.exe" ..\\build\\TheDesk-ia32.exe
-  - move "..\\build\\TheDesk Setup *.*.*.exe" ..\\build\\TheDesk-setup-ia32.exe
+  - mv ../build/TheDesk-setup*.exe ../build/output/TheDesk-setup-ia32.exe
+  - mv ../build/TheDesk*.exe ../build/output/TheDesk-ia32.exe
   - electron-builder --win --x64
-  - move "..\\build\\TheDesk *.*.*.exe" ..\\build\\TheDesk.exe
-  - move "..\\build\\TheDesk Setup *.*.*.exe" ..\\build\\TheDesk-setup.exe
+  - mv ../build/TheDesk-setup*.exe ../build/output/TheDesk-setup.exe
+  - mv ../build/TheDesk*.exe ../build/output/TheDesk.exe
   - electron-packager ./ TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=3.0.10 --overwrite
   - 7z a TheDesk-linux-x64.zip TheDesk-linux-x64
   - 7z a TheDesk-linux-ia32.zip TheDesk-linux-ia32
@@ -27,12 +27,11 @@ deploy:
   api_key:
     secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
   file: 
-    - "./build/TheDesk.exe"
-    - "./build/TheDesk-setup.exe"
-    - "./build/TheDesk-ia32.exe"
-    - "./build/TheDesk-setup-ia32.exe"
-    - "./build/TheDesk.snap"
-    - "./build/TheDesk-setup-ia32.exe"
+    - "./build/output/TheDesk.exe"
+    - "./build/output/TheDesk-setup.exe"
+    - "./build/output/TheDesk-ia32.exe"
+    - "./build/output/TheDesk-setup-ia32.exe"
+    - "./build/output/TheDesk-setup-ia32.exe"
     - "TheDesk-linux-x64.zip"
   on:
     repo: cutls/TheDesk
diff --git a/app/package.json b/app/package.json
index 2e0ff7cc..6babaadf 100644
--- a/app/package.json
+++ b/app/package.json
@@ -59,7 +59,8 @@
     },
     "nsis":{
       "oneClick":false,
-      "allowToChangeInstallationDirectory":true
+      "allowToChangeInstallationDirectory":true,
+      "artifactName":"TheDesk-setup.${ext}"
     },
     "linux": {
       "icon": "build/icons",