From 5b3f38cd21946a16d9493ff3a0968d04cfe7ac53 Mon Sep 17 00:00:00 2001 From: Yosef Date: Fri, 26 Aug 2016 02:08:04 +0000 Subject: [PATCH 01/13] First commit --- .SRCINFO | 14 ++++++++++++++ PKGBUILD | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..7750d69 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,14 @@ +pkgbase = nginxbeautifier + pkgdesc = Nginx config formatter and beautifier. + pkgver = latest + pkgrel = 1 + url = http://nginxbeautifier.com + arch = any + license = Apache-2.0 + depends = nodejs + provides = nginxbeautifier + source = nginxbeautifier::git://github.com/vasilevich/nginxbeautifier.git + md5sums = SKIP + +pkgname = nginxbeautifier + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..1ad2fb1 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,18 @@ +# Maintainer: Yosef Langer (vasilevich1234 dot gmail dot ...) + +pkgname=nginxbeautifier +pkgver=latest +pkgrel=1 +pkgdesc='Nginx config formatter and beautifier.' +arch=('any') +url='http://nginxbeautifier.com' +license=('Apache-2.0') +provides=('nginxbeautifier') +depends=('nodejs') +source=($pkgname::"git://github.com/vasilevich/${pkgname}.git") +md5sums=('SKIP') +package() { + cd "$pkgname" + install -D -m 755 nginxbeautifier.js "$pkgdir/usr/bin/nginxbeautifier" + +} From 15c65f3a0c6289667f4628b9c470cd58d5c9ee8d Mon Sep 17 00:00:00 2001 From: lyoko Date: Fri, 26 Aug 2016 02:10:04 +0000 Subject: [PATCH 02/13] fixed url in pkgbuild --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7750d69..0bbdba1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -2,7 +2,7 @@ pkgbase = nginxbeautifier pkgdesc = Nginx config formatter and beautifier. pkgver = latest pkgrel = 1 - url = http://nginxbeautifier.com + url = https://nginxbeautifier.com arch = any license = Apache-2.0 depends = nodejs diff --git a/PKGBUILD b/PKGBUILD index 1ad2fb1..fdf30e6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgver=latest pkgrel=1 pkgdesc='Nginx config formatter and beautifier.' arch=('any') -url='http://nginxbeautifier.com' +url='https://nginxbeautifier.com' license=('Apache-2.0') provides=('nginxbeautifier') depends=('nodejs') From f255c7f2a31f9f0bf442627467254acbfc1f8272 Mon Sep 17 00:00:00 2001 From: Yosef Date: Sun, 28 Aug 2016 16:20:38 +0000 Subject: [PATCH 03/13] made it take a specific source --- PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index fdf30e6..0f8686e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Yosef Langer (vasilevich1234 dot gmail dot ...) pkgname=nginxbeautifier -pkgver=latest +pkgver=Stable pkgrel=1 pkgdesc='Nginx config formatter and beautifier.' arch=('any') @@ -13,6 +13,7 @@ source=($pkgname::"git://github.com/vasilevich/${pkgname}.git") md5sums=('SKIP') package() { cd "$pkgname" + git checkout "e165def8f4b107bcd3f9f593f83bfa286070b42e" install -D -m 755 nginxbeautifier.js "$pkgdir/usr/bin/nginxbeautifier" } From 4a6d1e30c7e26da2ecade281cbc287092a9e02cb Mon Sep 17 00:00:00 2001 From: yosef Date: Sat, 15 Jul 2017 23:54:13 +0300 Subject: [PATCH 04/13] fixes --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 0f8686e..6c817cb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Yosef Langer (vasilevich1234 dot gmail dot ...) pkgname=nginxbeautifier -pkgver=Stable +pkgver=1.0.10 pkgrel=1 pkgdesc='Nginx config formatter and beautifier.' arch=('any') From 71a1f22e6fe3aabfb8d2b6ec4fc58382df9064bb Mon Sep 17 00:00:00 2001 From: yosef Date: Sun, 16 Jul 2017 00:09:45 +0300 Subject: [PATCH 05/13] fixed: dont touch make filenaems lowercase --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 6c817cb..9a117b0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Yosef Langer (vasilevich1234 dot gmail dot ...) pkgname=nginxbeautifier -pkgver=1.0.10 +pkgver=1.0.11 pkgrel=1 pkgdesc='Nginx config formatter and beautifier.' arch=('any') @@ -13,7 +13,7 @@ source=($pkgname::"git://github.com/vasilevich/${pkgname}.git") md5sums=('SKIP') package() { cd "$pkgname" - git checkout "e165def8f4b107bcd3f9f593f83bfa286070b42e" + git checkout "022e95d8f2dfc2ae5b8fe7744ac30fe78367b507" install -D -m 755 nginxbeautifier.js "$pkgdir/usr/bin/nginxbeautifier" } From 852af9af2c64e18edccfabd6b357717784c24653 Mon Sep 17 00:00:00 2001 From: Arm France Date: Sun, 22 Oct 2017 08:31:06 +0300 Subject: [PATCH 06/13] Updated to version 1.0.12 --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 9a117b0..35bffc5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Yosef Langer (vasilevich1234 dot gmail dot ...) pkgname=nginxbeautifier -pkgver=1.0.11 +pkgver=1.0.12 pkgrel=1 pkgdesc='Nginx config formatter and beautifier.' arch=('any') From 75e532a11a7c72c4b93750949812d5365c8730a5 Mon Sep 17 00:00:00 2001 From: Arm France Date: Sun, 22 Oct 2017 08:32:10 +0300 Subject: [PATCH 07/13] Updated to version 1.0.12 --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 0bbdba1..6e1dbf3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nginxbeautifier pkgdesc = Nginx config formatter and beautifier. - pkgver = latest + pkgver = 1.0.12 pkgrel = 1 url = https://nginxbeautifier.com arch = any From cf50c387578bf100ce0109b7197e730dc114dc06 Mon Sep 17 00:00:00 2001 From: Arm France Date: Sun, 22 Oct 2017 08:40:38 +0300 Subject: [PATCH 08/13] bumped version --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6e1dbf3..002e7ff 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nginxbeautifier pkgdesc = Nginx config formatter and beautifier. - pkgver = 1.0.12 + pkgver = 1.0.13 pkgrel = 1 url = https://nginxbeautifier.com arch = any diff --git a/PKGBUILD b/PKGBUILD index 35bffc5..a56030b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Yosef Langer (vasilevich1234 dot gmail dot ...) pkgname=nginxbeautifier -pkgver=1.0.12 +pkgver=1.0.13 pkgrel=1 pkgdesc='Nginx config formatter and beautifier.' arch=('any') From c50e257bdc4e34013395f1ec9ea3f26e49b395a6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 4 Dec 2018 21:07:53 +0000 Subject: [PATCH 09/13] fixed the issue mentioned here: https://github.com/vasilevich/nginxbeautifier/issues/9 --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index a56030b..94d6108 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Yosef Langer (vasilevich1234 dot gmail dot ...) pkgname=nginxbeautifier -pkgver=1.0.13 +pkgver=1.0.16 pkgrel=1 pkgdesc='Nginx config formatter and beautifier.' arch=('any') @@ -13,7 +13,7 @@ source=($pkgname::"git://github.com/vasilevich/${pkgname}.git") md5sums=('SKIP') package() { cd "$pkgname" - git checkout "022e95d8f2dfc2ae5b8fe7744ac30fe78367b507" + git checkout "5cf5c914a268ce0720f3862bd6e781b37ca768da" install -D -m 755 nginxbeautifier.js "$pkgdir/usr/bin/nginxbeautifier" } From 920d0bf9aa0193b90fd0dc7771603a4ff76e9fbd Mon Sep 17 00:00:00 2001 From: Felix Golatofski Date: Sun, 5 Jan 2020 20:36:18 +0100 Subject: [PATCH 10/13] Update to 1.0.18 --- .SRCINFO | 3 +-- PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 002e7ff..cb2bcc0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nginxbeautifier pkgdesc = Nginx config formatter and beautifier. - pkgver = 1.0.13 + pkgver = 1.0.18 pkgrel = 1 url = https://nginxbeautifier.com arch = any @@ -8,7 +8,6 @@ pkgbase = nginxbeautifier depends = nodejs provides = nginxbeautifier source = nginxbeautifier::git://github.com/vasilevich/nginxbeautifier.git - md5sums = SKIP pkgname = nginxbeautifier diff --git a/PKGBUILD b/PKGBUILD index 94d6108..80bb601 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Yosef Langer (vasilevich1234 dot gmail dot ...) pkgname=nginxbeautifier -pkgver=1.0.16 +pkgver=1.0.18 pkgrel=1 pkgdesc='Nginx config formatter and beautifier.' arch=('any') @@ -10,10 +10,10 @@ license=('Apache-2.0') provides=('nginxbeautifier') depends=('nodejs') source=($pkgname::"git://github.com/vasilevich/${pkgname}.git") -md5sums=('SKIP') +sha512sum=('SKIP') package() { cd "$pkgname" - git checkout "5cf5c914a268ce0720f3862bd6e781b37ca768da" + git checkout "49eaeb032466797705edcd4680d965e5d4ac513d" install -D -m 755 nginxbeautifier.js "$pkgdir/usr/bin/nginxbeautifier" } From 3b590f9697f75aa39a27397421a0239feecac1bb Mon Sep 17 00:00:00 2001 From: Felix Golatofski Date: Sun, 5 Jan 2020 20:38:23 +0100 Subject: [PATCH 11/13] Added source checks --- .SRCINFO | 1 + PKGBUILD | 1 + 2 files changed, 2 insertions(+) diff --git a/.SRCINFO b/.SRCINFO index cb2bcc0..08cd614 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -8,6 +8,7 @@ pkgbase = nginxbeautifier depends = nodejs provides = nginxbeautifier source = nginxbeautifier::git://github.com/vasilevich/nginxbeautifier.git + md5sums = SKIP pkgname = nginxbeautifier diff --git a/PKGBUILD b/PKGBUILD index 80bb601..d413b16 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,3 +17,4 @@ package() { install -D -m 755 nginxbeautifier.js "$pkgdir/usr/bin/nginxbeautifier" } +md5sums=('SKIP') From 74b9efb220f4166a60bab5613ddac279e2f0bfa2 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 21 Oct 2020 11:54:12 +0200 Subject: [PATCH 12/13] upgpkg: nginxbeautifier 1.0.19-1 upstream release Update to latest upstream revision --- .SRCINFO | 15 ++++++++------- PKGBUILD | 58 ++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 08cd614..fc496aa 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,14 +1,15 @@ pkgbase = nginxbeautifier - pkgdesc = Nginx config formatter and beautifier. - pkgver = 1.0.18 + pkgdesc = nginx config file formatter and beautifier + pkgver = 1.0.19 pkgrel = 1 - url = https://nginxbeautifier.com + url = https://github.com/vasilevich/nginxbeautifier arch = any - license = Apache-2.0 + license = Apache + makedepends = git + makedepends = npm depends = nodejs - provides = nginxbeautifier - source = nginxbeautifier::git://github.com/vasilevich/nginxbeautifier.git - md5sums = SKIP + source = nginxbeautifier::git+https://github.com/vasilevich/nginxbeautifier.git#commit=734ff631f254d8f17661d81e43927ba68e69f545 + sha512sums = SKIP pkgname = nginxbeautifier diff --git a/PKGBUILD b/PKGBUILD index d413b16..2366198 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,20 +1,46 @@ -# Maintainer: Yosef Langer (vasilevich1234 dot gmail dot ...) +# Maintainer: Sefa Eyeoglu +# Contributor: Yosef Langer (vasilevich1234 dot gmail dot ...) +_commit=734ff631f254d8f17661d81e43927ba68e69f545 pkgname=nginxbeautifier -pkgver=1.0.18 +pkgver=1.0.19 pkgrel=1 -pkgdesc='Nginx config formatter and beautifier.' -arch=('any') -url='https://nginxbeautifier.com' -license=('Apache-2.0') -provides=('nginxbeautifier') -depends=('nodejs') -source=($pkgname::"git://github.com/vasilevich/${pkgname}.git") -sha512sum=('SKIP') -package() { - cd "$pkgname" - git checkout "49eaeb032466797705edcd4680d965e5d4ac513d" - install -D -m 755 nginxbeautifier.js "$pkgdir/usr/bin/nginxbeautifier" - +pkgdesc="nginx config file formatter and beautifier" +arch=(any) +url="https://github.com/vasilevich/nginxbeautifier" +license=("Apache") +depends=("nodejs") +makedepends=("git" "npm") +source=("$pkgname::git+https://github.com/vasilevich/nginxbeautifier.git#commit=${_commit}") +sha512sums=('SKIP') + + +prepare() { + cd "${pkgname}" + + # remove junk + rm -rf ".idea/" +} + +build() { + cd "${pkgname}" + + # We create a taball of the project as "npm installing" (see package()) the directory itself only creates symlinks + npm pack +} + +package() { + cd "${pkgname}" + + npm install -g --user root --prefix "${pkgdir}/usr" "${pkgname}-${pkgver}.tgz" + # Non-deterministic race in npm gives 777 permissions to random directories. + # See https://github.com/npm/npm/issues/9359 for details. + find "${pkgdir}/usr" -type d -exec chmod 755 {} + + + # npm gives ownership of ALL FILES to build user + # https://bugs.archlinux.org/task/63396 + chown -R root:root "${pkgdir}" + + install -d "${pkgdir}/usr/share/doc/${pkgname}" + ln -s "/usr/lib/node_modules/${pkgname}/README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md" } -md5sums=('SKIP') From e2ca5007c4ff90e7962f657e1673fb451c73a66f Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 14 Apr 2021 14:23:18 +0200 Subject: [PATCH 13/13] upgpkg: nginxbeautifier 1.0.19-2 Fix npm --user flag --- .SRCINFO | 2 +- PKGBUILD | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fc496aa..a970a41 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nginxbeautifier pkgdesc = nginx config file formatter and beautifier pkgver = 1.0.19 - pkgrel = 1 + pkgrel = 2 url = https://github.com/vasilevich/nginxbeautifier arch = any license = Apache diff --git a/PKGBUILD b/PKGBUILD index 2366198..bef4b2a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ _commit=734ff631f254d8f17661d81e43927ba68e69f545 pkgname=nginxbeautifier pkgver=1.0.19 -pkgrel=1 +pkgrel=2 pkgdesc="nginx config file formatter and beautifier" arch=(any) url="https://github.com/vasilevich/nginxbeautifier" @@ -32,7 +32,7 @@ build() { package() { cd "${pkgname}" - npm install -g --user root --prefix "${pkgdir}/usr" "${pkgname}-${pkgver}.tgz" + npm install -g --prefix "${pkgdir}/usr" "${pkgname}-${pkgver}.tgz" # Non-deterministic race in npm gives 777 permissions to random directories. # See https://github.com/npm/npm/issues/9359 for details. find "${pkgdir}/usr" -type d -exec chmod 755 {} + @@ -44,3 +44,4 @@ package() { install -d "${pkgdir}/usr/share/doc/${pkgname}" ln -s "/usr/lib/node_modules/${pkgname}/README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md" } +