Skip to content

Commit

Permalink
Add option to disable delay (Issue #2)
Browse files Browse the repository at this point in the history
  • Loading branch information
crazy-max committed Jul 23, 2019
1 parent 08aa3a5 commit 1f3379b
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog

## 5.2.0-4 (2019/07/24)

* Add option to disable delay (Issue #2)

## 5.2.0-3 (2019/07/21)

* Franz 5.2.0
Expand Down
3 changes: 3 additions & 0 deletions build.properties
Expand Up @@ -34,6 +34,9 @@ electron.appasar3.replace = field: form.$('autoLaunchOnStart'), disabled: true
electron.appasar4.file = containers/settings/EditSettingsScreen.js
electron.appasar4.search = value: app.autoLaunchOnStart
electron.appasar4.replace = value: false
electron.appasar5.file = features/delayApp/index.js
electron.appasar5.search = if (isEnabled) {
electron.appasar5.replace = if (isEnabled && process.env.FRANZ_DELAY == "true") {

# Official artifacts
atf.id = franz
Expand Down
4 changes: 4 additions & 0 deletions build.xml
Expand Up @@ -66,6 +66,10 @@
<replace file="${extract.path}\resources\app\${electron.appasar4.file}" failOnNoReplacements="true">
<replacefilter token="${electron.appasar4.search}" value="${electron.appasar4.replace}"/>
</replace>
<assertfile file="${extract.path}\resources\app\${electron.appasar5.file}"/>
<replace file="${extract.path}\resources\app\${electron.appasar5.file}" failOnNoReplacements="true">
<replacefilter token="${electron.appasar5.search}" value="${electron.appasar5.replace}"/>
</replace>

<echo message="Removing app.asar..."/>
<delete file="${extract.path}\resources\app.asar"/>
Expand Down
19 changes: 18 additions & 1 deletion main.go
Expand Up @@ -16,15 +16,25 @@ import (
"github.com/portapps/portapps/pkg/utl"
)

type config struct {
DisableDelay bool `yaml:"disable_delay" mapstructure:"disable_delay"`
}

var (
app *App
cfg *config
)

func init() {
var err error

// Default config
cfg = &config{
DisableDelay: false,
}

// Init app
if app, err = New("franz-portable", "Franz"); err != nil {
if app, err = NewWithCfg("franz-portable", "Franz", cfg); err != nil {
Log.Fatal().Err(err).Msg("Cannot initialize application. See log file for more info.")
}
}
Expand All @@ -44,6 +54,13 @@ func main() {
Log.Error().Err(err).Msg("Cannot write default shortcut")
}

// Check delay
if cfg.DisableDelay {
utl.OverrideEnv("FRANZ_DELAY", "false")
} else {
utl.OverrideEnv("FRANZ_DELAY", "true")
}

// Update default shortcut
err = shortcut.Create(shortcut.Shortcut{
ShortcutPath: shortcutPath,
Expand Down

0 comments on commit 1f3379b

Please sign in to comment.