summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-10-22 17:18:32 +0800
committerzxp198210052024-10-22 17:18:32 +0800
commit3211bfc53ec593a0310f686c50776499398e3365 (patch)
treed8dee4f2df52c51b1e3b62d934c621e775f53641
parent7ce3d77a7a5f5d1283407b3840a81da1ee79015b (diff)
downloadaur-3211bfc53ec593a0310f686c50776499398e3365.tar.gz
update to 5.0.0.alpha.r37.g4964a9a
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD42
2 files changed, 27 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 81b0d26e3423..2f66bf1b2014 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = beekeeper-studio-git
- pkgdesc = Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more
- pkgver = 4.6.2.r412.g69f207c
+ pkgdesc = Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more.Use system-wide electron.
+ pkgver = 5.0.0.alpha.r37.g4964a9a
pkgrel = 1
url = https://www.beekeeperstudio.io/
arch = any
@@ -12,6 +12,7 @@ pkgbase = beekeeper-studio-git
makedepends = gendesk
makedepends = gcc
makedepends = cmake
+ makedepends = jq
depends = electron31
source = beekeeper-studio.git::git+https://github.com/beekeeper-studio/beekeeper-studio.git
source = beekeeper-studio.sh
diff --git a/PKGBUILD b/PKGBUILD
index f7ff8ea262f4..5cb32bcce3ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
pkgname=beekeeper-studio-git
_pkgname="Beekeeper Studio"
-pkgver=4.6.2.r412.g69f207c
+pkgver=5.0.0.alpha.r37.g4964a9a
_electronversion=31
_nodeversion=20
pkgrel=1
-pkgdesc="Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more"
+pkgdesc="Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more.Use system-wide electron."
arch=('any')
url="https://www.beekeeperstudio.io/"
_ghurl="https://github.com/beekeeper-studio/beekeeper-studio"
@@ -21,6 +21,7 @@ makedepends=(
'gendesk'
'gcc'
'cmake'
+ 'jq'
)
source=(
"${pkgname%-git}.git::git+${_ghurl}.git"
@@ -30,7 +31,9 @@ sha256sums=('SKIP'
'291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980')
pkgver() {
cd "${srcdir}/${pkgname%-git}.git"
- git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g'
+ set -o pipefail
+ git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g;s/test//g' ||
+ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
}
_ensure_local_nvm() {
local NVM_DIR="${srcdir}/.nvm"
@@ -40,21 +43,22 @@ _ensure_local_nvm() {
}
build() {
sed -e "
- s/@electronversion@/${_electronversion}/
- s/@appname@/${pkgname%-git}/
- s/@runname@/app.asar/
- s/@cfgdirname@/${_pkgname}/
- s/@options@/env ELECTRON_OZONE_PLATFORM_HINT=auto/
+ s/@electronversion@/${_electronversion}/g
+ s/@appname@/${pkgname%-git}/g
+ s/@runname@/app.asar/g
+ s/@cfgdirname@/${_pkgname}/g
+ s/@options@/env ELECTRON_OZONE_PLATFORM_HINT=auto/g
" -i "${srcdir}/${pkgname%-git}.sh"
_ensure_local_nvm
gendesk -q -f -n --pkgname="${pkgname%-git}" --pkgdesc="${pkgdesc}" --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U"
cd "${srcdir}/${pkgname%-git}.git/"
+ electronDist="/usr/lib/electron${_electronversion}"
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
HOME="${srcdir}/.electron-gyp"
mkdir -p "${srcdir}/.electron-gyp"
- {
- if [[ "$(curl -s ipinfo.io/country)" == *"CN"* ]]; then
+ if [[ "$(curl -s ipinfo.io/country)" == *"CN"* ]]; then
+ {
echo -e '\n'
echo 'registry "https://registry.npmmirror.com"'
echo 'disturl "https://registry.npmmirror.com/-/binary/node/"'
@@ -68,18 +72,20 @@ build() {
echo 'linkWorkspacePackages true'
echo 'fetchRetries 3'
echo 'fetchRetryTimeout 10000'
- fi
- } >> .yarnrc
- rm -rf apps/studio/dist_electron
- sed -i "/'snap',/d;/'deb',/d;s/'appImage'/'dir'/" -i apps/studio/electron-builder-config.js
- sed -i "s/\"electron\": \"[^\"]*\"/\"electron\": \"${SYSTEM_ELECTRON_VERSION}\"/" apps/studio/package.json
- NODE_ENV=development yarn install --no-lockfile --cache-folder "${srcdir}/.yarn_cache"
- NODE_ENV=production yarn run electron:build
+ } >> .yarnrc
+ sed -i "s/registry.yarnpkg.com/registry.npmmirror.com/g" yarn.lock
+ fi
+ NODE_ENV=development yarn install --cache-folder "${srcdir}/.yarn_cache"
+ cd "${srcdir}/${pkgname%-git}.git/apps/studio"
+ sed -i "s/\"electron\": \"[^\"]*\"/\"electron\": \"${SYSTEM_ELECTRON_VERSION}\"/g" package.json
+ NODE_ENV=production yarn run build
+ NODE_ENV=production yarn electron-builder --linux dir -c.electronDist="${electronDist}" --config electron-builder-config.js
+
}
package() {
install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}"
install -Dm644 "${srcdir}/${pkgname%-git}.git/apps/studio/dist_electron/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-git}"
- cp -r "${srcdir}/${pkgname%-git}.git/apps/studio/dist_electron/linux-"*/resources/{app.asar.unpacked,public,vendor,demo,db} "${pkgdir}/usr/lib/${pkgname%-git}"
+ cp -r "${srcdir}/${pkgname%-git}.git/apps/studio/dist_electron/linux-"*/resources/{app.asar.unpacked,public,vendor,demo.db} "${pkgdir}/usr/lib/${pkgname%-git}"
icon_sizes=(16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256 512x512 1024x1024)
for _icons in "${icon_sizes[@]}";do
install -Dm644 "${srcdir}/${pkgname%-git}.git/apps/studio/public/icons/png/${_icons}.png" \