aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2013-12-19 08:30:23 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2013-12-19 08:30:23 +0000
commit8bb99971778669cfeec37c66b5edae66855340c8 (patch)
treebaf19d63ea43330c0e6d8cb68f794330ae654369
parent6f7d894652b9e17183edabb49e409dc870042ccc (diff)
parent8cd447e15ca6b751b2b9d9d84307583ba845462f (diff)
downloadaports-8bb99971778669cfeec37c66b5edae66855340c8.tar.bz2
aports-8bb99971778669cfeec37c66b5edae66855340c8.tar.xz
Merge ../aports-larena
-rw-r--r--main/racktables/APKBUILD (renamed from testing/racktables/APKBUILD)4
-rwxr-xr-xmain/racktables/racktables.post-install (renamed from testing/racktables/racktables.post-install)0
2 files changed, 2 insertions, 2 deletions
diff --git a/testing/racktables/APKBUILD b/main/racktables/APKBUILD
index d80ae8187b..677e0de11a 100644
--- a/testing/racktables/APKBUILD
+++ b/main/racktables/APKBUILD
@@ -3,7 +3,7 @@
pkgname=racktables
_realname=RackTables
pkgver=0.20.6
-pkgrel=0
+pkgrel=1
pkgdesc="Server room asset management"
url="http://racktables.org"
arch="noarch"
@@ -37,7 +37,7 @@ package() {
make DESTDIR="${pkgdir}" install
make DESTDIR="${pkgdir}" install-docs
mkdir -p "$pkgdir"/etc/racktables
- sed -i 's%<?php%<?php\n$racktables_confdir='/etc/racktables';%' \
+ sed -i "s%<?php%<?php\n\n\$racktables_confdir = '/etc/racktables';%" \
"$pkgdir"/usr/share/webapps/RackTables/wwwroot/index.php
}
diff --git a/testing/racktables/racktables.post-install b/main/racktables/racktables.post-install
index b01b10d8fe..b01b10d8fe 100755
--- a/testing/racktables/racktables.post-install
+++ b/main/racktables/racktables.post-install