Skip to content

Commit f99160d

Browse files
committed
Updated Ubuntu 8.04 instructions
Modified the update scripts to check if a download of the tar.gz has succeeded.
1 parent 22eabc9 commit f99160d

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

docs/INSTALL_UBUNTU_8.04.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ ___
115115

116116
set docroot to:
117117
###
118-
docroot=/var/clients
118+
docroot=/var/www/clients
119119
###
120120

121121
Change: application/x-httpd-php=php:/usr/bin/php-cgi to:

server/scripts/ispconfig_update.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,13 @@ function simple_query($query, $answers, $default)
9595
$new_version = trim($new_version);
9696
if($new_version != ISPC_APP_VERSION) {
9797
passthru('/usr/local/ispconfig/server/scripts/update_from_tgz.sh');
98+
exit;
9899
} else {
99100
echo "There are no updates available for ISPConfig ".ISPC_APP_VERSION."\n";
100101
}
101102
} else {
102103
passthru('/usr/local/ispconfig/server/scripts/update_from_svn.sh');
104+
exit;
103105
}
104106

105107

server/scripts/update_from_svn.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ svn export svn://svn.ispconfig.org/ispconfig3/trunk/
55
cd trunk/install
66
php -q update.php
77
cd /tmp
8-
rm -rf /tmp/trunk
8+
rm -rf /tmp/trunk
9+
10+
exit 0

server/scripts/update_from_tgz.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,15 @@ rm -f ISPConfig-3-stable.tar.gz
88
fi
99

1010
wget http://www.ispconfig.org/downloads/ISPConfig-3-stable.tar.gz
11-
tar xvfz ISPConfig-3-stable.tar.gz
12-
cd ispconfig3_install/install/
13-
php -q update.php
14-
rm -rf /tmp/ispconfig3_install/install
15-
rm -f ISPConfig-3-stable.tar.gz
11+
if [ -f ISPConfig-3-stable.tar.gz ]
12+
then
13+
tar xvfz ISPConfig-3-stable.tar.gz
14+
cd ispconfig3_install/install/
15+
php -q update.php
16+
rm -rf /tmp/ispconfig3_install/install
17+
rm -f ISPConfig-3-stable.tar.gz
18+
else
19+
echo "Unable to download the update."
20+
fi
21+
22+
exit 0

0 commit comments

Comments
 (0)