summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlibia Tsati2015-11-21 20:34:06 +0200
committerOlibia Tsati2015-11-21 20:34:06 +0200
commit6d1116fb34a8bbbb736eefa45fdb8abf5dfa1abb (patch)
tree6dea0f3ad8b070f147cefd3c1f319738d766eedd
parentc9e88b67ccab7462e92bff4b222d5924a17d11ce (diff)
downloadaur-6d1116fb34a8bbbb736eefa45fdb8abf5dfa1abb.tar.gz
fix installation
move server and cli helpers in package folder
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
-rwxr-xr-xdevdocs-cli3
-rwxr-xr-xdevdocs-cli.sh3
-rwxr-xr-xdevdocs-server3
-rwxr-xr-xdevdocs-server.sh3
6 files changed, 17 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2e78f68a8351..7ef7796cee90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = devdocs-git
pkgdesc = API Documentation Browser
pkgver = r1002.de1c879
- pkgrel = 1
+ pkgrel = 2
url = http://devdocs.io
arch = any
license = GPL
@@ -13,8 +13,8 @@ pkgbase = devdocs-git
depends = coffee-script
provides = devdocs-git
source = devdocs-git::git+https://github.com/Thibaut/devdocs
- source = devdocs-server
- source = devdocs-cli
+ source = devdocs-server.sh
+ source = devdocs-cli.sh
source = devdocs.service
md5sums = SKIP
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index bd0edbd20543..7707d4d23355 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jonian Guveli <https://github.com/jonian/>
pkgname=devdocs-git
pkgver=r1002.de1c879
-pkgrel=1
+pkgrel=2
pkgdesc="API Documentation Browser"
arch=('any')
url="http://devdocs.io"
@@ -17,7 +17,7 @@ backup=()
options=()
install=
changelog=
-source=($pkgname::git+https://github.com/Thibaut/devdocs devdocs-server devdocs-cli devdocs.service)
+source=("$pkgname::git+https://github.com/Thibaut/devdocs" "devdocs-server.sh" "devdocs-cli.sh" "devdocs.service")
noextract=()
md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
@@ -37,9 +37,12 @@ package() {
cp -a "$srcdir/$pkgname" "$pkgdir/opt/$pkgname"
sed -i "/ruby /d" "$pkgdir/opt/$pkgname/Gemfile"
- cp -a "$srcdir/devdocs-server" "$pkgdir/usr/bin/devdocs-server"
- cp -a "$srcdir/devdocs-cli" "$pkgdir/usr/bin/devdocs-cli"
- cp -a "$srcdir/devdocs.service" "$pkgdir/usr/lib/systemd/system/devdocs.service"
+ cp "$srcdir/devdocs-server.sh" "$pkgdir/opt/$pkgname/devdocs-server.sh"
+ cp "$srcdir/devdocs-cli.sh" "$pkgdir/opt/$pkgname/devdocs-cli.sh"
+ cp "$srcdir/devdocs.service" "$pkgdir/usr/lib/systemd/system/devdocs.service"
+
+ ln -s "/opt/$pkgname/devdocs-server.sh" "$pkgdir/usr/bin/devdocs-server"
+ ln -s "/opt/$pkgname/devdocs-cli.sh" "$pkgdir/usr/bin/devdocs-cli"
cd "$pkgdir/opt/$pkgname" && bundle install --path .bundle
cd "$pkgdir/opt/$pkgname" && thor assets:clean && thor assets:compile
diff --git a/devdocs-cli b/devdocs-cli
deleted file mode 100755
index bf13728fd31e..000000000000
--- a/devdocs-cli
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd "/opt/devdocs-git" && thor "$@"
-
diff --git a/devdocs-cli.sh b/devdocs-cli.sh
new file mode 100755
index 000000000000..ea896c24fe58
--- /dev/null
+++ b/devdocs-cli.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+thor "$@"
+
diff --git a/devdocs-server b/devdocs-server
deleted file mode 100755
index 1fd3844e6ef4..000000000000
--- a/devdocs-server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd "/opt/devdocs-git" && bundle exec rackup "$@"
-
diff --git a/devdocs-server.sh b/devdocs-server.sh
new file mode 100755
index 000000000000..6bfe8e4fb266
--- /dev/null
+++ b/devdocs-server.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+bundle exec rackup "$@"
+