Insomnia 2020.4.2

Author: crazy-max

CHANGELOG.md

@@ -1,8 +1,8 @@
 # Changelog
 
-## 2020.4.1-22 (2020/09/24)
+## 2020.4.2-22 (2020/10/28)
 
-* Insomnia 2020.4.1
+* Insomnia 2020.4.2
 * Portapps 2.6.0
 
 ## 2020.3.0-21 (2020/07/23)

build.properties

@@ -5,7 +5,7 @@ core.dir = ../portapps
 app = insomnia
 app.name = Insomnia
 app.type = electron
-app.version = 2020.4.1
+app.version = 2020.4.2
 app.release = 22
 app.homepage = https://insomnia.rest
 
@@ -21,9 +21,9 @@ papp.folder = app
 electron.executionstub = Insomnia_ExecutionStub.exe
 electron.libfolder = lib/net45
 electron.enableautoupdate = false
-electron.userdata.file = browser/init.js
-electron.userdata.search = app.setPath('userData', path.join(app.getPath('appData'), app.getName()))
-electron.userdata.replace = app.setPath('userData', path.join(path.dirname(process.execPath), '..', '..', 'data'))
+electron.appasar.file = main.min.js
+electron.appasar.search = app.setPath('userData', newPath);
+electron.appasar.replace = //app.setPath('userData', newPath);
 
 # Official artifacts
 atf.id = Insomnia

build.xml

@@ -16,4 +16,24 @@
   <!-- Targets -->
   <target name="release" depends="release.app" description="Release"/>
 
+  <target name="prepare" depends="load.lib.asar">
+    <echo message="Preparing release..."/>
+
+    <echo message="Extracting app.asar..."/>
+    <exec executable="asar.cmd" failonerror="true" dir="${build.path}\${papp.folder}\app-${app.version}\resources">
+      <arg value="extract"/>
+      <arg value="app.asar"/>
+      <arg value="app"/>
+    </exec>
+
+    <echo message="Replacing in app.asar..."/>
+    <assertfile file="${build.path}\${papp.folder}\app-${app.version}\resources\app\${electron.appasar.file}"/>
+    <replace file="${build.path}\${papp.folder}\app-${app.version}\resources\app\${electron.appasar.file}" failOnNoReplacements="true">
+      <replacefilter token="${electron.appasar.search}" value="${electron.appasar.replace}"/>
+    </replace>
+
+    <echo message="Removing app.asar..."/>
+    <delete file="${build.path}\${papp.folder}\app-${app.version}\resources\app.asar"/>
+  </target>
+
 </project>

main.go

@@ -40,6 +40,9 @@ func main() {
 
 	app.Process = utl.PathJoin(electronBinPath, "Insomnia.exe")
 	app.WorkingDir = electronBinPath
+	app.Args = []string{
+		"--user-data-dir=" + app.DataPath,
+	}
 
 	// Cleanup on exit
 	if cfg.Cleanup {
@@ -51,6 +54,7 @@ func main() {
 	}
 
 	utl.OverrideEnv("INSOMNIA_DATA_PATH", app.DataPath)
+	utl.OverrideEnv("INSOMNIA_DISABLE_AUTOMATIC_UPDATES", "true")
 
 	defer app.Close()
 	app.Launch(os.Args[1:])