Skip to content

Commit

Permalink
multiple: style fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@noptrix
noptrix committed Nov 21, 2024
1 parent 4b6c6d3 commit 4e27c09
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 57 deletions.
67 changes: 35 additions & 32 deletions packages/bruno/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ _ensure_local_nvm() {
# lets be sure we are starting clean
which nvm >/dev/null 2>&1 && nvm deactivate && nvm unload

export NVM_DIR="${srcdir}/${pkgname}-${pkgver}/.nvm"
export NVM_DIR="$srcdir/$pkgname-$pkgver/.nvm"
# The init script returns 3 if version
# specified in ./.nvrc is not (yet) installed in $NVM_DIR
# but nvm itself still gets loaded ok
Expand All @@ -43,57 +43,60 @@ pkgver() {
}

prepare() {
_ensure_local_nvm
cd $pkgname
_ensure_local_nvm
cd $pkgname

nvm install
nvm install

# https://typicode.github.io/husky/how-to.html#ci-server-and-docker
export HUSKY=0
# https://typicode.github.io/husky/how-to.html#ci-server-and-docker
export HUSKY=0

npm install --cache "$srcdir/npm-cache"
npm install --cache "$srcdir/npm-cache"

npm install electron-builder --save-dev --cache "$srcdir/npm-cache"
npm install node-addon-api --save-dev --cache "$srcdir/npm-cache"
npm install electron-builder --save-dev --cache "$srcdir/npm-cache"
npm install node-addon-api --save-dev --cache "$srcdir/npm-cache"
}

build() {
_ensure_local_nvm
export NODE_ENV=production
export NODE_OPTIONS=--openssl-legacy-provider
_ensure_local_nvm
export NODE_ENV=production
export NODE_OPTIONS=--openssl-legacy-provider

cd $pkgname
cd $pkgname

npm run build:graphql-docs
npm run build:bruno-query
npm run build:bruno-common
npm run sandbox:bundle-libraries --workspace=packages/bruno-js
npm run build:web
npm run build:graphql-docs
npm run build:bruno-query
npm run build:bruno-common
npm run sandbox:bundle-libraries --workspace=packages/bruno-js
npm run build:web

electronDist="/usr/lib/$_electron"
electronVer="$(cat $electronDist/version)"
sed -i -e "s~\"dist:linux\":.*~\"dist:linux\": \"electron-builder --linux --x64 --dir --config electron-builder-config.js -c.electronDist=$electronDist -c.electronVersion=$electronVer\",~g" packages/bruno-electron/package.json
electronDist="/usr/lib/$_electron"
electronVer="$(cat $electronDist/version)"
sed -i -e "s~\"dist:linux\":.*~\"dist:linux\": \"electron-builder --linux --x64 --dir --config electron-builder-config.js -c.electronDist=$electronDist -c.electronVersion=$electronVer\",~g" packages/bruno-electron/package.json

npm run build:electron:linux
npm run build:electron:linux
}

package() {
install -Dm0644 com.usebruno.app.Bruno.desktop -t "$pkgdir/usr/share/applications/"
cd $pkgname

cd $pkgname
install -Dm 644 "$srcdir/com.usebruno.app.Bruno.desktop" -t \
"$pkgdir/usr/share/applications/"

install -Dm0755 /dev/null "$pkgdir/usr/bin/$pkgname"
cat >> "$pkgdir/usr/bin/$pkgname" <<EOD
install -Dm 755 /dev/null "$pkgdir/usr/bin/$pkgname"
cat >> "$pkgdir/usr/bin/$pkgname" <<EOD
#! /usr/bin/sh
ELECTRON_IS_DEV=0 exec $_electron /usr/lib/bruno "\$@"
EOD

install -Dm0644 license.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
install -d "$pkgdir/usr/lib/$pkgname/"
asar e packages/bruno-electron/out/linux-unpacked/resources/app.asar "$pkgdir/usr/lib/$pkgname/"
install -Dm 644 license.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
install -d "$pkgdir/usr/lib/$pkgname/"
asar e packages/bruno-electron/out/linux-unpacked/resources/app.asar \
"$pkgdir/usr/lib/$pkgname/"

for i in 16 24 48 64 128 256 512 1024; do
install -Dm644 "packages/bruno-electron/resources/icons/png/${i}x${i}.png" "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/com.usebruno.app.Bruno.png"
done
for i in 16 24 48 64 128 256 512 1024; do
install -Dm 644 "packages/bruno-electron/resources/icons/png/${i}x${i}.png"\
"$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/com.usebruno.app.Bruno.png"
done
}

38 changes: 13 additions & 25 deletions packages/nvm/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,23 @@ url='https://github.com/nvm-sh/nvm'
arch=('any')
license=('MIT')
optdepends=('bash: bash completion')
install="${pkgname}.install"
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/nvm-sh/nvm/archive/v${pkgver}.tar.gz"
"init-nvm.sh"
"install-nvm-exec")
install="$pkgname.install"
source=("https://github.com/nvm-sh/nvm/archive/v$pkgver.tar.gz"
'init-nvm.sh'
'install-nvm-exec')
sha512sums=('ccf4d43abc3c812ffc694e95770fef39bdd9963c77606636f1cd54dcd64a8ec3e338aa56ba907a81a671191eda6accbb0fcda25ccf14d439d7a7d7a96acfba4d'
'b6a1906f644aa3cab17baeaf9e8bf0b256215b5fa082d73261095f45b5f16769fa91bccc597b22c2cfda0751b0e7f5865e2ff77176bb3e0998966be1fee5a76c'
'148753d8d76cda4be75139628c04784b7abb70859d3815aa651bfd91a326b8c6b71897c27e7c1482c3255f271057ebc09147cbaba9faa36a66c2e6e2c6d4612a')

package() {
cd "${srcdir}"

# convenience script
install -Dm644 init-nvm.sh "$pkgdir/usr/share/$pkgname/init-nvm.sh"

# companion script which installs symlinks in NVM_DIR (see comment in script)
install -Dm644 install-nvm-exec "$pkgdir/usr/share/$pkgname/install-nvm-exec"

cd "${pkgname}-${pkgver}"

# nvm itself
install -Dm644 nvm.sh "$pkgdir/usr/share/$pkgname/nvm.sh"

# nvm-exec script for 'nvm exec' command
install -Dm755 nvm-exec "$pkgdir/usr/share/$pkgname/nvm-exec"

# bash completion
install -Dm644 bash_completion "$pkgdir/usr/share/$pkgname/bash_completion"

# license
install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
cd "$pkgname-$pkgver"

install -Dm 644 "$srcdir/init-nvm.sh" "$pkgdir/usr/share/$pkgname/init-nvm.sh"
install -Dm 644 "$srcdir/install-nvm-exec" \
"$pkgdir/usr/share/$pkgname/install-nvm-exec"
install -Dm 644 nvm.sh "$pkgdir/usr/share/$pkgname/nvm.sh"
install -Dm 755 nvm-exec "$pkgdir/usr/share/$pkgname/nvm-exec"
install -Dm 644 bash_completion "$pkgdir/usr/share/$pkgname/bash_completion"
install -Dm 644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}

0 comments on commit 4e27c09

Please sign in to comment.