From 9dcb79e938108ac34c9ef235a4482fdadcba19c5 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Thu, 15 Oct 2020 17:42:01 +0200
Subject: [PATCH] Fix build

---
 assets/assets.go |  7 +++++--
 build.properties |  5 -----
 build.xml        | 16 ----------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/assets/assets.go b/assets/assets.go
index 0d5ce46..f5bfc61 100644
--- a/assets/assets.go
+++ b/assets/assets.go
@@ -20,7 +20,7 @@ import (
 func bindataRead(data []byte, name string) ([]byte, error) {
 	gz, err := gzip.NewReader(bytes.NewBuffer(data))
 	if err != nil {
-		return nil, fmt.Errorf("read %q: %v", name, err)
+		return nil, fmt.Errorf("read %q: %w", name, err)
 	}
 
 	var buf bytes.Buffer
@@ -28,7 +28,7 @@ func bindataRead(data []byte, name string) ([]byte, error) {
 	clErr := gz.Close()
 
 	if err != nil {
-		return nil, fmt.Errorf("read %q: %v", name, err)
+		return nil, fmt.Errorf("read %q: %w", name, err)
 	}
 	if clErr != nil {
 		return nil, err
@@ -183,6 +183,9 @@ var _bindata = map[string]func() (*asset, error){
 	"Rocket.Chat.lnk": rocketChatLnk,
 }
 
+// AssetDebug is true if the assets were built with the debug flag enabled.
+const AssetDebug = false
+
 // AssetDir returns the file names below a certain
 // directory embedded in the file by go-bindata.
 // For example if you run go-bindata on data/... and data contains the
diff --git a/build.properties b/build.properties
index a11d3cc..7db6a5f 100644
--- a/build.properties
+++ b/build.properties
@@ -17,11 +17,6 @@ papp.desc = ${app.name} portable on Windows by Portapps
 papp.url = https://github.com/portapps/${papp.id}
 papp.folder = app
 
-# Electron
-electron.appasar.file = app/main.js
-electron.appasar.search = electron.app.setPath('userData', path.join(electron.app.getPath('appData'), dirName));
-electron.appasar.replace = //electron.app.setPath('userData', path.join(electron.app.getPath('appData'), dirName));
-
 # Official artifacts
 atf.id = Rocket.Chat
 atf.win32.filename = rocketchat-setup-${app.version}
diff --git a/build.xml b/build.xml
index 8cd569f..e2f6d99 100644
--- a/build.xml
+++ b/build.xml
@@ -34,22 +34,6 @@
     <move todir="${extract.path}">
       <fileset dir="${extract.path2}" defaultexcludes="no"/>
     </move>
-
-    <echo message="Extracting app.asar..."/>
-    <exec executable="asar.cmd" failonerror="true" dir="${extract.path}\resources">
-      <arg value="extract"/>
-      <arg value="app.asar"/>
-      <arg value="app"/>
-    </exec>
-
-    <echo message="Replacing in app.asar..."/>
-    <assertfile file="${extract.path}\resources\app\${electron.appasar.file}"/>
-    <replace file="${extract.path}\resources\app\${electron.appasar.file}" failOnNoReplacements="true">
-      <replacefilter token="${electron.appasar.search}" value="${electron.appasar.replace}"/>
-    </replace>
-
-    <echo message="Removing app.asar..."/>
-    <delete file="${extract.path}\resources\app.asar"/>
   </target>
 
 </project>