summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrnmst/Franco Masotti2016-11-15 17:22:28 +0100
committerfrnmst/Franco Masotti2016-11-15 17:22:28 +0100
commit1b5383bde976a320adfe01dc456a93ca68edfd7b (patch)
tree1528c1cdf00aa26db860a55ea995db595e4dc5d9
parenteb0a4126d3f407079a2d2d15725b99f053a6e8c1 (diff)
downloadaur-1b5383bde976a320adfe01dc456a93ca68edfd7b.tar.gz
Lots of fixes.
-rw-r--r--.SRCINFO4
-rw-r--r--.install6
-rw-r--r--PKGBUILD6
-rwxr-xr-xrun.sh25
4 files changed, 17 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c048362ac7..f9e7ea1f189 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = swish
pkgdesc = SWI-Prolog for SHaring: a SWI-Prolog web IDE
pkgver = r1124.071295b
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/SWI-Prolog/swish
install = .install
arch = x86_64
@@ -9,6 +9,8 @@ pkgbase = swish
makedepends = git
makedepends = bower
makedepends = sed
+ depends = libxinerama
+ depends = libxpm
depends = swi-prolog-devel
conflicts = swish-cplint
source = git+https://github.com/SWI-Prolog/swish#branch=master
diff --git a/.install b/.install
index f5c15b9427a..29d276a75b7 100644
--- a/.install
+++ b/.install
@@ -6,11 +6,11 @@ post_install() {
chown -R swish:swish /usr/share/swish
- printf "\n\nYou can start and enable \
-swish.service to run the server.\n\n"
+ printf "\n\n%s\n\n" "You can start and enable \
+swish.service to run the server."
}
post_remove()
{
- printf "\n\nYou can remove swish user and group.\n\n"
+ printf "\n\n%s\n\n" "You can remove swish user and group."
}
diff --git a/PKGBUILD b/PKGBUILD
index dc52c5966c0..36be8f0a8be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,14 @@
# Contributor: Franco Masotti <franco dot masotti at student dot unife dot it>
pkgname=swish
pkgver=r1124.071295b
-pkgrel=2
+pkgrel=3
pkgdesc="SWI-Prolog for SHaring: a SWI-Prolog web IDE"
arch=('x86_64')
url="https://github.com/SWI-Prolog/swish"
license=('BSD')
-depends=('swi-prolog-devel')
+depends=('libxinerama'
+ 'libxpm'
+ 'swi-prolog-devel')
makedepends=('git'
'bower'
'sed')
diff --git a/run.sh b/run.sh
index 7a446416fff..cdabef6b9cd 100755
--- a/run.sh
+++ b/run.sh
@@ -70,7 +70,7 @@ startd()
exec swipl --quiet -f "$pkg_dir"/run.pl
) &
pid="$!"
- } 1>/dev/null 2>/dev/null
+ }
write_pid_file "$pid"
}
@@ -123,26 +123,15 @@ write_pid_file()
fi
}
-killd()
-{
- # kill action only if process exists.
- if [ -f "$pid_file" ]; then
- pid=$(cat "$pid_file")
- ps -q $pid > /dev/null
- if [ $? -eq 0 ]; then
- kill -s TERM $pid
- fi
- fi
-}
-
option_parser()
{
- getopts ":hks" opt "$@"
+ getopts ":hiks" opt "$@"
case "$opt" in
- h) help ;;
- k) killd ;;
- s) startd ;;
- ?) help; return 1 ;;
+ h ) help ;;
+ i ) init ;;
+ k ) killd ;;
+ s ) startd ;;
+ ? ) help; return 1 ;;
esac
}