diff options
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | appveyor.yml | 1 | ||||
-rw-r--r-- | electron-builder.yml | 8 | ||||
-rw-r--r-- | src/components/ui/AppLoader/index.js | 15 | ||||
-rw-r--r-- | src/index.js | 6 |
5 files changed, 18 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 1d328aad5..124a6fc8a 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -26,3 +26,4 @@ cache: npm | |||
26 | branches: | 26 | branches: |
27 | except: | 27 | except: |
28 | - i18n | 28 | - i18n |
29 | - l10n_master | ||
diff --git a/appveyor.yml b/appveyor.yml index 157e35df3..39d7f793a 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
@@ -25,3 +25,4 @@ artifacts: | |||
25 | branches: | 25 | branches: |
26 | except: | 26 | except: |
27 | - i18n | 27 | - i18n |
28 | - l10n_master | ||
diff --git a/electron-builder.yml b/electron-builder.yml index e95eb47b7..b2c243e49 100644 --- a/electron-builder.yml +++ b/electron-builder.yml | |||
@@ -27,10 +27,10 @@ dmg: | |||
27 | win: | 27 | win: |
28 | icon: ./build-helpers/images/icon.ico | 28 | icon: ./build-helpers/images/icon.ico |
29 | target: | 29 | target: |
30 | target: nsis | 30 | - target: nsis |
31 | arch: | 31 | arch: [x64, ia32] |
32 | - x64 | 32 | - target: portable |
33 | - ia32 | 33 | arch: [x64, ia32] |
34 | 34 | ||
35 | linux: | 35 | linux: |
36 | icon: ./build-helpers/images/icons | 36 | icon: ./build-helpers/images/icons |
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js index a9a87707b..1fd247d17 100644 --- a/src/components/ui/AppLoader/index.js +++ b/src/components/ui/AppLoader/index.js | |||
@@ -9,14 +9,13 @@ import { shuffleArray } from '../../../helpers/array-helpers'; | |||
9 | import styles from './styles'; | 9 | import styles from './styles'; |
10 | 10 | ||
11 | const textList = shuffleArray([ | 11 | const textList = shuffleArray([ |
12 | 'Looking for Sisi', | 12 | 'Adding free features', |
13 | 'Contacting the herald', | 13 | 'Making application usable', |
14 | 'Saddling the unicorn', | 14 | 'Removing unproductive paywalls', |
15 | 'Learning the Waltz', | 15 | 'Creating custom server software', |
16 | 'Visiting Horst & Grete', | 16 | 'Increasing productivity', |
17 | 'Twisting my moustache', | 17 | 'Listening to our userbase', |
18 | 'Playing the trumpet', | 18 | 'Fixing bugs', |
19 | 'Traveling through space & time', | ||
20 | ]); | 19 | ]); |
21 | 20 | ||
22 | export default @injectSheet(styles) @withTheme class AppLoader extends Component { | 21 | export default @injectSheet(styles) @withTheme class AppLoader extends Component { |
diff --git a/src/index.js b/src/index.js index 73fc6e299..1b982c77e 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -11,7 +11,11 @@ import windowStateKeeper from 'electron-window-state'; | |||
11 | 11 | ||
12 | // Set app directory before loading user modules | 12 | // Set app directory before loading user modules |
13 | if (isDevMode) { | 13 | if (isDevMode) { |
14 | app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev')); | 14 | app.setPath('userData', path.join(app.getPath('appData'), app.getName() + 'Dev')); |
15 | } else if (process.env.FERDI_USERDATA_DIR != null) { | ||
16 | app.setPath('userData', process.env.FERDI_USERDATA_DIR) | ||
17 | } else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { | ||
18 | app.setPath('userData', path.join(process.env.PORTABLE_EXECUTABLE_DIR, app.getName())); | ||
15 | } | 19 | } |
16 | 20 | ||
17 | /* eslint-disable import/first */ | 21 | /* eslint-disable import/first */ |