upgraded to the latest version

8 files changed, 34 insertions, 128 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4adf60d4ab3f..d40dc1e4470c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,15 @@
 pkgbase = kiwiirc
 	pkgdesc = A hand-crafted web-based IRC client that you can enjoy
-	pkgver = 0.9.4
+	pkgver = 1.1.0.r2044.g4c979963
 	pkgrel = 1
 	url = https://kiwiirc.com/
 	install = kiwiirc.install
 	arch = any
-	license = AGPL3
+	license = APACHE
 	makedepends = git
-	depends = nodejs>=4.0.0,
-	depends = npm
-	options = emptydirs
-	options = !strip
-	backup = etc/kiwiirc/config.js
-	source = https://github.com/prawnsalad/KiwiIRC/archive/v0.9.4.tar.gz
-	source = kiwi.patch
-	source = kiwiirc.service
-	source = kiwiirc.conf.sysusers
-	source = kiwiirc.conf.tmpfiles
-	md5sums = 1a06e33088ca6ed89f857f7687470761
-	md5sums = 14a75cab7c10f2dd17856ab5a99d3bfc
-	md5sums = bcb28ddb7f0bcc3be830b8045969eb2c
-	md5sums = 593da856bcf9036bc51380b74d9df394
-	md5sums = 803080337de27be8921edd76f15c763c
+	makedepends = yarn
+	source = git+https://github.com/kiwiirc/kiwiirc
+	md5sums = SKIP
 
 pkgname = kiwiirc
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..ed6f39f408b3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*/
+*.pkg*
+*.tar*
+yarn.lock
diff --git a/PKGBUILD b/PKGBUILD
index afdde9438f8c..e679c194da12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,36 @@
-# Maintainer: Jack Allnutt <jack@allnutt.eu>
+# Maintainer: Jingbei Li <i@jingbei.li>
+# Contributor: Jack Allnutt <jack@allnutt.eu>
 pkgname=kiwiirc
-pkgver=0.9.4
+pkgver=1.1.0.r2044.g4c979963
 pkgrel=1
 pkgdesc="A hand-crafted web-based IRC client that you can enjoy"
 arch=('any')
 url="https://kiwiirc.com/"
-license=('AGPL3')
-depends=('nodejs>=4.0.0', 'npm')
-makedepends=('git')
-options=('emptydirs' '!strip')
+license=('APACHE')
+makedepends=('git' 'yarn')
 install='kiwiirc.install'
-backup=('etc/kiwiirc/config.js')
-source=(https://github.com/prawnsalad/KiwiIRC/archive/v$pkgver.tar.gz
-    'kiwi.patch'
-    'kiwiirc.service'
-    'kiwiirc.conf.sysusers'
-    'kiwiirc.conf.tmpfiles')
-md5sums=('1a06e33088ca6ed89f857f7687470761'
-         '14a75cab7c10f2dd17856ab5a99d3bfc'
-         'bcb28ddb7f0bcc3be830b8045969eb2c'
-         '593da856bcf9036bc51380b74d9df394'
-         '803080337de27be8921edd76f15c763c')
+source=(git+https://github.com/kiwiirc/kiwiirc)
+md5sums=('SKIP')
+
+pkgver () {
+    cd "${pkgname}"
+    (
+        set -o pipefail
+        git describe --long 2>/dev/null | sed -e 's/\([^-]*-g\)/r\1/;s/-/./g' -e 's/^v//'||
+        printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    )
+}
 
 build() {
-    cp kiwiirc.service "$srcdir/KiwiIRC-$pkgver/"
-    cp kiwiirc.conf.sysusers "$srcdir/KiwiIRC-$pkgver/"
-    cp kiwiirc.conf.tmpfiles "$srcdir/KiwiIRC-$pkgver/"
-    cd "$srcdir/KiwiIRC-$pkgver"
-    git apply --whitespace=fix ../kiwi.patch
-    npm -q install
-    npm -q dedupe
+    cd "$srcdir/$pkgname"
+    yarn install
+    yarn run build
 }
 
 package() {
-    cd "$srcdir"
-    install -D -m644 KiwiIRC-$pkgver/config.example.js $pkgdir/etc/kiwiirc/config.js
-    install -D -m755 KiwiIRC-$pkgver/kiwi $pkgdir/usr/bin/kiwi
-    install -D -m644 KiwiIRC-$pkgver/kiwiirc.service $pkgdir/usr/lib/systemd/system/kiwiirc.service
-    install -D -m644 KiwiIRC-$pkgver/man/kiwiirc.1 $pkgdir/usr/share/man/man1/kiwi.1
-    install -D -m644 KiwiIRC-$pkgver/package.json $pkgdir/usr/share/kiwiirc/package.json
-    install -D -m644 KiwiIRC-$pkgver/README.md $pkgdir/usr/share/kiwiirc/README.md
-    install -D -m644 KiwiIRC-$pkgver/kiwiirc.conf.sysusers $pkgdir/usr/lib/sysusers.d/kiwiirc.conf
-    install -D -m644 KiwiIRC-$pkgver/kiwiirc.conf.tmpfiles $pkgdir/usr/lib/tmpfiles.d/kiwiirc.conf
-
-    install -d -m755 $pkgdir/usr/lib/kiwiirc/server_modules
-    install -d -m755 $pkgdir/var/lib/kiwiirc
-    install -d -m644 $pkgdir/var/log/kiwiirc
-    install -d -m755 $pkgdir/usr/share/kiwiirc/server
-    install -d -m755 $pkgdir/usr/share/kiwiirc/node_modules
+    cd "$srcdir/$pkgname"
 
-    cp -dr --preserve=mode KiwiIRC-$pkgver/client/* $pkgdir/var/lib/kiwiirc
-    cp -dr --preserve=mode KiwiIRC-$pkgver/node_modules $pkgdir/usr/share/kiwiirc/
-    cp -dr --preserve=mode KiwiIRC-$pkgver/server $pkgdir/usr/share/kiwiirc
-    cp -dr --preserve=mode KiwiIRC-$pkgver/server_modules $pkgdir/usr/lib/kiwiirc
+    mkdir -p $pkgdir/usr/share/webapps/
+    cp -r dist $pkgdir/usr/share/webapps/kiwiirc
+    sed 's/welcome/personal/' -i $pkgdir/usr/share/webapps/kiwiirc/static/config.json
 }
diff --git a/kiwi.patch.2 b/kiwi.patch.2
deleted file mode 100644
index ca91ef315a67..000000000000
--- a/kiwi.patch.2
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/server/helpers/launcher.js b/server/helpers/launcher.js
-index a1f1208..47770b6 100644
---- a/server/helpers/launcher.js
-+++ b/server/helpers/launcher.js
-@@ -1,5 +1,5 @@
- var kiwi_app = '../kiwi.js';

--var pidfile = '../../kiwiirc.pid';

-+var pidfile = '/run/kiwiirc/kiwiirc.pid';

- var pidfile_arg;

- 

- // Check if a pidfile has been set as an argument

-@@ -16,6 +16,13 @@ if (process.argv.indexOf('-p') > -1) {
-     }

- }

- 

-+try {

-+    process.setgid('kiwiirc');

-+    process.setuid('kiwiirc');

-+} catch (e) {

-+    console.error('Cannot switch to user kiwiirc. Try running as root.')

-+    process.exit();

-+}

- 

- var daemon = require('daemonize2').setup({

-     main: kiwi_app,

diff --git a/kiwiirc.conf.sysusers b/kiwiirc.conf.sysusers
deleted file mode 100644
index 6de7a507745f..000000000000
--- a/kiwiirc.conf.sysusers
+++ /dev/null
@@ -1 +0,0 @@
-u kiwiirc - "Kiwi IRC User"
diff --git a/kiwiirc.conf.tmpfiles b/kiwiirc.conf.tmpfiles
deleted file mode 100644
index 34dc03c924c7..000000000000
--- a/kiwiirc.conf.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-R /run/kiwiirc - kiwiirc kiwiirc - -
-D /run/kiwiirc - kiwiirc kiwiirc - -
diff --git a/kiwiirc.install b/kiwiirc.install
index d929bbf8a425..f9db2bb4bddb 100644
--- a/kiwiirc.install
+++ b/kiwiirc.install
@@ -1,26 +1,7 @@
 post_install() {
-    systemd-sysusers
-    systemd-tmpfiles --create /usr/lib/tmpfiles.d/kiwiirc.conf
-
-    chown -R kiwiirc:kiwiirc /etc/kiwiirc
-    chown -R kiwiirc:kiwiirc /usr/lib/kiwiirc
-    chown -R kiwiirc:kiwiirc /usr/share/kiwiirc
-    chown -R kiwiirc:kiwiirc /var/lib/kiwiirc
-
-    setcap CAP_NET_BIND_SERVICE=+pe /usr/bin/node
-
-    sudo -u kiwiirc kiwi build
-} 
+    echo Please see https://wiki.archlinux.org/index.php/KiwiIRC and set up the web server to use KiwiIRC!
+}
 
 post_upgrade() {
     post_install
 }
-
-pre_remove() {
-    systemctl disable kiwiirc.service
-    systemd-tmpfiles --remove /usr/lib/tmpfiles.d/kiwiirc.conf
-}
-
-post_remove() {
-    rm -rf /var/lib/kiwiirc/
-}
diff --git a/kiwiirc.service b/kiwiirc.service
deleted file mode 100644
index 4364d7b7cb37..000000000000
--- a/kiwiirc.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Kiwi IRC web client
-After=network.target
-
-[Service]
-User=kiwiirc
-Group=kiwiirc
-Type=forking
-ProtectSystem=full
-ReadWriteDirectories=/var/lib/kiwiirc /var/log/kiwiirc /run/kiwiirc
-ReadOnlyDirectories=/usr/share/kiwiirc
-ExecStart=/usr/bin/kiwi start -p %t/kiwiirc/kiwiirc.pid
-ExecStop=/usr/bin/kiwi stop -p %t/kiwiirc/kiwiirc.pid
-ExecReload=/usr/bin/kiwi reconfig -p %t/kiwiirc/kiwiirc.pid
-PIDFile=%t/kiwiirc/kiwiirc.pid
-SuccessExitStatus=SIGTERM 0 143
-
-[Install]
-WantedBy=multi-user.target