diff options
| author | libertylocked | 2021-07-26 06:09:39 -0700 |
|---|---|---|
| committer | libertylocked | 2021-07-26 06:09:39 -0700 |
| commit | 7f6430cc156d7d426fb910245ba87ffc22bb3080 (patch) | |
| tree | a9e142217bd4701638de8f68a7579b51d6affd78 | |
| parent | 1c449cb2b5fc85582f717617a045abdb26db5569 (diff) | |
| download | aur-7f6430cc156d7d426fb910245ba87ffc22bb3080.tar.gz | |
patch out preinstall
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | package.json.patch | 12 |
3 files changed, 14 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = bitwarden pkgdesc = Bitwarden Desktop Application pkgver = 1.27.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/bitwarden/desktop arch = x86_64 arch = aarch64 @@ -31,7 +31,7 @@ pkgbase = bitwarden source = bitwarden.desktop sha512sums = de2c476581cac6a8a875d3d6ff11e67cd74f4b1c5dcf00a98df4541b38b848382901dca1284940e4006fbb234bb43a69c24e3c945f73e71f0a448795c41136bf sha512sums = 86eb6d0de6efb6f0e2d18c94787f3a4b881234c998407d03cc2ce6c1f5ae56033552e873dfa80d2357405ca2b772fbcfb3085196d7f83deadb02e2d7fe351ea3 - sha512sums = 4e7496960ff01212809d165fea1d3a7ce1e4da73c65d7bef34b1da9d245b49d4092b19823a8966c69b4dbe01508ee2b1fd624395b6096d7df12bfcf475f8c718 + sha512sums = d884221c615db95d6fd0da2d3470fb7514b6a5d2a2b3b20c8353ebb4a938dc39f93783fe7ef2b9f69f034db8f26abfa479616f9fd1c1b241af605da837fba20e sha512sums = dfd5e24512444ea0b4b45b41da39fac28476c14fda22a7afd8bee2436fdad348d3ba51df7b0bbfd1039496214f2e8a6ec2d8b0dd0ad3b95825cece110790e0db sha512sums = 32c29a7baed80351acf5753d35df404a818d5c88cc85f3bbed2daa5351aaf0dba20fd03cbedbcb407324f305d4556adb476ecc9ccd07bac0511ca4a943020ea4 sha512sums = 05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd @@ -3,7 +3,7 @@ pkgname=bitwarden pkgver=1.27.1 -pkgrel=1 +pkgrel=2 _jslibcommit='dbd92194ee4536d87bed5d89f39078e68c59a06c' _nodeversion='14.17.3' pkgdesc='Bitwarden Desktop Application' @@ -22,7 +22,7 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/bitwarden/desktop/archi "${pkgname}.desktop") sha512sums=('de2c476581cac6a8a875d3d6ff11e67cd74f4b1c5dcf00a98df4541b38b848382901dca1284940e4006fbb234bb43a69c24e3c945f73e71f0a448795c41136bf' '86eb6d0de6efb6f0e2d18c94787f3a4b881234c998407d03cc2ce6c1f5ae56033552e873dfa80d2357405ca2b772fbcfb3085196d7f83deadb02e2d7fe351ea3' - '4e7496960ff01212809d165fea1d3a7ce1e4da73c65d7bef34b1da9d245b49d4092b19823a8966c69b4dbe01508ee2b1fd624395b6096d7df12bfcf475f8c718' + 'd884221c615db95d6fd0da2d3470fb7514b6a5d2a2b3b20c8353ebb4a938dc39f93783fe7ef2b9f69f034db8f26abfa479616f9fd1c1b241af605da837fba20e' 'dfd5e24512444ea0b4b45b41da39fac28476c14fda22a7afd8bee2436fdad348d3ba51df7b0bbfd1039496214f2e8a6ec2d8b0dd0ad3b95825cece110790e0db' '32c29a7baed80351acf5753d35df404a818d5c88cc85f3bbed2daa5351aaf0dba20fd03cbedbcb407324f305d4556adb476ecc9ccd07bac0511ca4a943020ea4' '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd') @@ -55,6 +55,8 @@ build() { nvm install ${_nodeversion} && nvm use ${_nodeversion} export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + cd "${srcdir}/desktop-${pkgver}/jslib/common" + npm install cd "${srcdir}/desktop-${pkgver}/jslib/angular" npm install cd "${srcdir}/desktop-${pkgver}/jslib" diff --git a/package.json.patch b/package.json.patch index e6e8c8c89922..3e55ddcc4ac5 100644 --- a/package.json.patch +++ b/package.json.patch @@ -1,9 +1,13 @@ ---- package.json.orig 2021-07-07 23:22:02.048638075 -0700 -+++ package.json 2021-07-07 23:22:57.996596663 -0700 -@@ -24,5 +24,5 @@ +--- package.json.orig 2021-07-26 05:47:04.787356255 -0700 ++++ package.json 2021-07-26 05:47:20.505211209 -0700 +@@ -22,8 +22,8 @@ + "sub:update": "git submodule update --remote", + "sub:pull": "git submodule foreach git pull origin master", "sub:commit": "npm run sub:pull && git commit -am \"update submodule\"", - "preinstall": "npm run sub:init", +- "preinstall": "npm run sub:init", - "postinstall": "patch-package && electron-rebuild", ++ "preinstall": "", + "postinstall": "patch-package", "symlink:win": "rm -rf ./jslib && cmd /c mklink /J .\\jslib ..\\jslib", "symlink:mac": "npm run symlink:lin", + "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib", |