Fix beekeeper-studio build, fix argv handling

5 files changed, 43 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ddcfba335703..70b584d874b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = beekeeper-studio
 	pkgdesc = Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more
 	pkgver = 3.9.1.0
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/beekeeper-studio/beekeeper-studio
 	arch = x86_64
@@ -16,15 +16,15 @@ pkgbase = beekeeper-studio
 	makedepends = python
 	makedepends = yarn
 	depends = electron>=22.0.0
-	source = beekeeper-studio-1:3.9.1.0-1.tar.gz::https://github.com/beekeeper-studio/beekeeper-studio/archive/v3.9.1.0.tar.gz
-	source = fix-version.diff
+	source = beekeeper-studio-1:3.9.1.0-2.tar.gz::https://github.com/beekeeper-studio/beekeeper-studio/archive/v3.9.1.0.tar.gz
 	source = electron-builder-config.diff
 	source = configure-environment.diff
 	source = fix-argv.diff
+	source = debug.diff
 	sha512sums = 15a1db20d5be8a3807b4efe138b526abd2d300f018b20740f060be4a35f5c47bc7712d5b6d09b5e69fda51f72be9c8d68a09b122a012b0cbf6d3ad6cd5672c55
-	sha512sums = 0eb03f920b884d1c586848810eb4a244ed97bf624a2944c44e16a67d4789c422bc2cce1d34376a6a6bbfa9c31ed27ac92acb66847d79fb925ea3200b965a7ff4
 	sha512sums = c8c63ffdc75ec73f6258aa0020b228f86d883de0c6608b14b3a35604dfeaebac7ae89f0dbc57b3bbb922cbfc3231117d769488f194961c68af646574d9ea49e0
 	sha512sums = dc653535664904c74c812b589881994c1109c664f9174186ccd362a42172edeb0251712c98f3c9a17d7356bf47f942eff03c2294181402ff9cbc9cb211616d57
-	sha512sums = ae6b5847bdf65f8fb43b3694c151f55c307b2b402624b627b755133b4173760fa4673158b77c252b8a9b18dc33be3068e2c79e23762a4de05de11447cf259c3c
+	sha512sums = e26142437693fbadb34e8421507770458658311c8c199f3333730961600716ecf1b89de438f0b36c56f387804a4b9a708b32f5ec0e89765bb9fdbc8c44b6fcc7
+	sha512sums = f9adf19932ba34b9662f1fb6bb6b77cada68e37d330cae4639cc70b91500d09800bdda5cd1247319b30a4d034630528abbd0b5eaa34fe3c0be73f41deceb0e39
 
 pkgname = beekeeper-studio
diff --git a/PKGBUILD b/PKGBUILD
index 2c620dee6839..93398995e425 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Daniel Peukert <daniel@peukert.cc>
 pkgname='beekeeper-studio'
 pkgver='3.9.1.0'
-pkgrel='1'
+_packagejsonver='3.9.1'
+pkgrel='2'
 epoch='1'
 pkgdesc='Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more'
 # If you're running on armv7h or aarch64, use the electron22-bin package from the AUR for the electron dependency
@@ -14,16 +15,16 @@ depends=("$_electronpkg>=22.0.0")
 makedepends=('git' 'libxcrypt-compat' 'nodejs>=16.0.0' 'nodejs<19.0.0' 'npm' 'python' 'yarn')
 source=(
 	"$pkgname-$epoch:$pkgver-$pkgrel.tar.gz::$url/archive/v$pkgver.tar.gz"
-	'fix-version.diff'
 	'electron-builder-config.diff'
 	'configure-environment.diff'
 	'fix-argv.diff'
+	'debug.diff'
 )
 sha512sums=('15a1db20d5be8a3807b4efe138b526abd2d300f018b20740f060be4a35f5c47bc7712d5b6d09b5e69fda51f72be9c8d68a09b122a012b0cbf6d3ad6cd5672c55'
-            '0eb03f920b884d1c586848810eb4a244ed97bf624a2944c44e16a67d4789c422bc2cce1d34376a6a6bbfa9c31ed27ac92acb66847d79fb925ea3200b965a7ff4'
             'c8c63ffdc75ec73f6258aa0020b228f86d883de0c6608b14b3a35604dfeaebac7ae89f0dbc57b3bbb922cbfc3231117d769488f194961c68af646574d9ea49e0'
             'dc653535664904c74c812b589881994c1109c664f9174186ccd362a42172edeb0251712c98f3c9a17d7356bf47f942eff03c2294181402ff9cbc9cb211616d57'
-            'ae6b5847bdf65f8fb43b3694c151f55c307b2b402624b627b755133b4173760fa4673158b77c252b8a9b18dc33be3068e2c79e23762a4de05de11447cf259c3c')
+            'e26142437693fbadb34e8421507770458658311c8c199f3333730961600716ecf1b89de438f0b36c56f387804a4b9a708b32f5ec0e89765bb9fdbc8c44b6fcc7'
+            'f9adf19932ba34b9662f1fb6bb6b77cada68e37d330cae4639cc70b91500d09800bdda5cd1247319b30a4d034630528abbd0b5eaa34fe3c0be73f41deceb0e39')
 
 _sourcedirectory="$pkgname-$pkgver"
 
@@ -31,10 +32,10 @@ _sourcedirectory="$pkgname-$pkgver"
 prepare() {
 	cd "$srcdir/$_sourcedirectory/"
 
-	patch --forward -p1 < "$srcdir/fix-version.diff"
 	patch --forward -p1 < "$srcdir/electron-builder-config.diff"
 	patch --forward -p1 < "$srcdir/configure-environment.diff"
 	patch --forward -p1 < "$srcdir/fix-argv.diff"
+	patch --forward -p1 < "$srcdir/debug.diff"
 
 	sed -i "s|%%ELECTRON_DIST%%|/usr/lib/$_electronpkg|g" 'apps/studio/vue.config.js'
 	sed -i "s|%%ELECTRON_VERSION%%|$(cat "/usr/lib/$_electronpkg/version")|g" 'apps/studio/vue.config.js'
@@ -63,7 +64,7 @@ EOF
 
 	# Extract pacman archive and copy files
 	mkdir -p "$srcdir/$pkgname-$pkgver-$pkgrel-pacman/"
-	tar -xf "$pkgname-$pkgver.pacman" --directory "$srcdir/$pkgname-$pkgver-$pkgrel-pacman/"
+	tar -xf "$pkgname-$_packagejsonver.pacman" --directory "$srcdir/$pkgname-$pkgver-$pkgrel-pacman/"
 	cd "$srcdir/$pkgname-$pkgver-$pkgrel-pacman/"
 
 	install -dm755 "$pkgdir/usr/share/"
diff --git a/debug.diff b/debug.diff
new file mode 100644
index 000000000000..2dfd59bfcdd3
--- /dev/null
+++ b/debug.diff
@@ -0,0 +1,19 @@
+diff --git a/apps/studio/src/common/platform_info.ts b/apps/studio/src/common/platform_info.ts
+index e2869981..be93e021 100644
+--- a/apps/studio/src/common/platform_info.ts
++++ b/apps/studio/src/common/platform_info.ts
+@@ -39,6 +39,7 @@ const homeDirectory = testMode ? './tmp' : e.app.getPath('home')
+ if (p.env.PORTABLE_EXECUTABLE_DIR) {
+   userDirectory = path.join(p.env.PORTABLE_EXECUTABLE_DIR, 'beekeeper_studio_data')
+ }
++console.log(p.env, p.env.SSH_AUTH_SOCK);
+ const platformInfo = {
+   isWindows, isMac,
+   isLinux: !isWindows && !isMac,
+@@ -68,5 +69,5 @@ const platformInfo = {
+   cloudUrl: isDevEnv ? 'https://staging.beekeeperstudio.io' : 'https://app.beekeeperstudio.io',
+   // cloudUrl: isDevEnv ? 'http://localhost:3000' : 'https://app.beekeeperstudio.io'
+ }
+-
++console.log(platformInfo);
+ export default platformInfo
diff --git a/fix-argv.diff b/fix-argv.diff
index c68c20fb84c5..3840252d0616 100644
--- a/fix-argv.diff
+++ b/fix-argv.diff
@@ -1,13 +1,22 @@
 diff --git a/apps/studio/src/background.ts b/apps/studio/src/background.ts
-index e2f50467..fa297cb7 100644
+index b49e4515..6a6f6d6b 100644
 --- a/apps/studio/src/background.ts
 +++ b/apps/studio/src/background.ts
-@@ -107,7 +107,7 @@ app.on('ready', async () => {
+@@ -109,7 +109,16 @@ app.on('ready', async () => {
        console.error('Vue Devtools failed to install:', e.toString())
      }
    }
 -  const slice = platformInfo.isDevelopment ? 2 : 1
-+  const slice = platformInfo.isDevelopment ? 2 : 2
++
++  let slice = 0;
++
++  for (const arg of process.argv) {
++    slice++;
++    if (arg.includes('app.asar') === true) {
++      break;
++    }
++  }
++
    const parsedArgs = yargs(process.argv.slice(slice))
    log.debug("Parsing app args", parsedArgs)
    const options = parsedArgs._.map((url: string) => ({ url }))
diff --git a/fix-version.diff b/fix-version.diff
deleted file mode 100644
index a4d6273e7a8d..000000000000
--- a/fix-version.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/apps/studio/package.json b/apps/studio/package.json
-index fad4e7ff..77ae0044 100644
---- a/apps/studio/package.json
-+++ b/apps/studio/package.json
-@@ -1,6 +1,6 @@
- {
-   "name": "beekeeper-studio",
--  "version": "3.9.1",
-+  "version": "3.9.1.0",
-   "private": true,
-   "description": "An easy-to use SQL query editor and database UI for Mac, Windows, and Linux",
-   "author": {