summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenat Lumpau <rl03@gentoo.org>2005-08-21 14:55:48 +0000
committerRenat Lumpau <rl03@gentoo.org>2005-08-21 14:55:48 +0000
commitbb698d53332ff5e70ada69a2fb75e46b8dd252d3 (patch)
tree770741b10b9cad6808f218815826b4d2a4550290 /dev-db/phpmyadmin/files
parentFix compilation of skge, bug #103127. (diff)
downloadgentoo-2-bb698d53332ff5e70ada69a2fb75e46b8dd252d3.tar.gz
gentoo-2-bb698d53332ff5e70ada69a2fb75e46b8dd252d3.tar.bz2
gentoo-2-bb698d53332ff5e70ada69a2fb75e46b8dd252d3.zip
Housekeeping
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-db/phpmyadmin/files')
-rw-r--r--dev-db/phpmyadmin/files/postinstall-en.txt4
-rw-r--r--dev-db/phpmyadmin/files/reconfig12
2 files changed, 12 insertions, 4 deletions
diff --git a/dev-db/phpmyadmin/files/postinstall-en.txt b/dev-db/phpmyadmin/files/postinstall-en.txt
index 32e06db5890c..1a77f7dc2a30 100644
--- a/dev-db/phpmyadmin/files/postinstall-en.txt
+++ b/dev-db/phpmyadmin/files/postinstall-en.txt
@@ -5,7 +5,7 @@ To complete installation, you must
If you are upgrading from an earlier version and are using phpMyAdmin's
features for master/foreign tables be sure to read
- http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/Documentation.html#col_com
+ http://${VHOST_HOSTNAME}${VHOST_APPDIR}/Documentation.html#col_com
You will need to perform the ALTER TABLE step yourself.
-Finally, point your browser to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/.
+Finally, point your browser to http://${VHOST_HOSTNAME}${VHOST_APPDIR}
diff --git a/dev-db/phpmyadmin/files/reconfig b/dev-db/phpmyadmin/files/reconfig
index 56998b47a1f2..675fc41f1fe2 100644
--- a/dev-db/phpmyadmin/files/reconfig
+++ b/dev-db/phpmyadmin/files/reconfig
@@ -1,8 +1,16 @@
#!/bin/bash
+
+die() {
+ echo "#####"
+ echo $1
+ echo "#####"
+ exit 1
+}
+
if [ $1 = "install" ]; then
cd ${MY_INSTALLDIR}
- sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}${VHOST_APPDIR}';|g" -i config.inc.php
-
+ sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}${VHOST_APPDIR}';|g" -i config.inc.php || die "sed failed"
+
elif [ $1 = "clean" ]; then
echo $1
fi