summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bruhin2016-03-29 10:29:52 +0200
committerFlorian Bruhin2016-03-29 10:30:18 +0200
commit3bcbca0b324618e8f57ffb876284f39a9d25192e (patch)
tree9d10631e7a7d1e3ed95073852810107e2e8eacca
parenta1369a59d5a1500ee47759186eb5464f3be5008d (diff)
downloadaur-3bcbca0b324618e8f57ffb876284f39a9d25192e.tar.gz
Remove ENABLE_INSTALL from install-file
ENABLE_INSTALL got removed upstream.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
-rw-r--r--baikal.install7
3 files changed, 3 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f7ad8f2a9990..acc5be04c961 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Mar 29 08:28:06 UTC 2016
+# Tue Mar 29 08:30:13 UTC 2016
pkgbase = baikal
pkgdesc = Lightweight CalDAV+CardDAV server
pkgver = 0.4.3
@@ -16,7 +16,7 @@ pkgbase = baikal
source = https://github.com/fruux/Baikal/releases/download/0.4.3/baikal-0.4.3.zip
source = baikal.install
sha1sums = 6bda8f780d178723a3cb77ee353907f3e5cea44a
- sha1sums = 80692b8c87873d0ec9b4f2ab336aad9b055125d8
+ sha1sums = 423fff2842cafd8e601f58666e2ee007963d3136
pkgname = baikal
diff --git a/PKGBUILD b/PKGBUILD
index 72883ca34fc0..07beaea5cf73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ optdepends=('sqlite: Database' 'mariadb: Alternate database' 'php-sqlite: To use
source=("https://github.com/fruux/Baikal/releases/download/$pkgver/baikal-$pkgver.zip"
'baikal.install')
sha1sums=('6bda8f780d178723a3cb77ee353907f3e5cea44a'
- '80692b8c87873d0ec9b4f2ab336aad9b055125d8')
+ '423fff2842cafd8e601f58666e2ee007963d3136')
options=('!strip')
install=baikal.install
diff --git a/baikal.install b/baikal.install
index 707c440ffbaf..27a21362d95c 100644
--- a/baikal.install
+++ b/baikal.install
@@ -10,18 +10,12 @@ post_install() {
/var/lib/baikal/db
chown -R http:http /var/lib/baikal/db
fi
- # Now create install file
- touch /var/lib/baikal/ENABLE_INSTALL
echo "Please add /var/lib/baikal to open_basedir in your /etc/php.ini."
echo
echo "You also need to set up your webserver for baikal, there are example"
echo "configs for Apache/nginx at http://sabre.io/baikal/install/."
echo
echo "After that, navigate to your baikal instance to complete the setup."
- echo
- echo "Note: If you complete the setup more in than an hour, you'll need to"
- echo "execute this manually so baikal allows you to install:"
- echo " touch /var/lib/baikal/ENABLE_INSTALL"
}
post_upgrade() {
@@ -29,7 +23,6 @@ post_upgrade() {
echo "Please add /var/lib/baikal to open_basedir in your /etc/php.ini."
fi
if [[ $(vercmp $2 0.3.0) == -1 ]]; then
- touch /var/lib/baikal/ENABLE_INSTALL
echo "Navigate to your baikal instance to complete the upgrade."
fi
}