Skip to content

Commit b34f99d

Browse files
author
Marius Cramer
committed
Updated script to install development version to match switch from svn to git
1 parent eb3ab43 commit b34f99d

File tree

7 files changed

+32
-25
lines changed

7 files changed

+32
-25
lines changed

‎install/dist/lib/fedora.lib.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,14 +1142,14 @@ public function install_ispconfig()
11421142
//exec('chmod +r /var/log/clamav/freshclam.log');
11431143

11441144
//* Install the update script
1145-
if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
1146-
exec('chown root /usr/local/ispconfig/server/scripts/update_from_svn.sh');
1147-
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_svn.sh');
1145+
if(is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) unlink('/usr/local/bin/ispconfig_update_from_dev.sh');
1146+
exec('chown root /usr/local/ispconfig/server/scripts/update_from_dev.sh');
1147+
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_dev.sh');
11481148
exec('chown root /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
11491149
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
11501150
exec('chown root /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
11511151
exec('chmod 700 /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
1152-
if(!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_svn.sh');
1152+
if(!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_dev.sh');
11531153
if(!is_link('/usr/local/bin/ispconfig_update.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update.sh');
11541154

11551155
// set the fast cgi starter script to executable

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -990,19 +990,19 @@ public function install_ispconfig()
990990
}
991991

992992
//* Install the update script
993-
if (is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) {
994-
unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
993+
if (is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) {
994+
unlink('/usr/local/bin/ispconfig_update_from_dev.sh');
995995
}
996996

997-
chown($install_dir.'/server/scripts/update_from_svn.sh', 'root');
998-
chmod($install_dir.'/server/scripts/update_from_svn.sh', 0700);
997+
chown($install_dir.'/server/scripts/update_from_dev.sh', 'root');
998+
chmod($install_dir.'/server/scripts/update_from_dev.sh', 0700);
999999
chown($install_dir.'/server/scripts/update_from_tgz.sh', 'root');
10001000
chmod($install_dir.'/server/scripts/update_from_tgz.sh', 0700);
10011001
chown($install_dir.'/server/scripts/ispconfig_update.sh', 'root');
10021002
chmod($install_dir.'/server/scripts/ispconfig_update.sh', 0700);
10031003

1004-
if (!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) {
1005-
symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_svn.sh');
1004+
if (!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) {
1005+
symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_dev.sh');
10061006
}
10071007

10081008
if (!is_link('/usr/local/bin/ispconfig_update.sh')) {

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,14 +1193,14 @@ public function install_ispconfig()
11931193
//exec('chmod +r /var/log/clamav/freshclam.log');
11941194

11951195
//* Install the update script
1196-
if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
1197-
exec('chown root /usr/local/ispconfig/server/scripts/update_from_svn.sh');
1198-
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_svn.sh');
1196+
if(is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) unlink('/usr/local/bin/ispconfig_update_from_dev.sh');
1197+
exec('chown root /usr/local/ispconfig/server/scripts/update_from_dev.sh');
1198+
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_dev.sh');
11991199
exec('chown root /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
12001200
exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
12011201
exec('chown root /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
12021202
exec('chmod 700 /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
1203-
if(!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_svn.sh');
1203+
if(!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_dev.sh');
12041204
if(!is_link('/usr/local/bin/ispconfig_update.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update.sh');
12051205

12061206
//set the fast cgi starter script to executable

‎install/lib/installer_base.lib.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2003,14 +2003,14 @@ public function install_ispconfig() {
20032003
}
20042004

20052005
//* Install the update script
2006-
if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
2007-
chown($install_dir.'/server/scripts/update_from_svn.sh', 'root');
2008-
chmod($install_dir.'/server/scripts/update_from_svn.sh', 0700);
2006+
if(is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) unlink('/usr/local/bin/ispconfig_update_from_dev.sh');
2007+
chown($install_dir.'/server/scripts/update_from_dev.sh', 'root');
2008+
chmod($install_dir.'/server/scripts/update_from_dev.sh', 0700);
20092009
chown($install_dir.'/server/scripts/update_from_tgz.sh', 'root');
20102010
chmod($install_dir.'/server/scripts/update_from_tgz.sh', 0700);
20112011
chown($install_dir.'/server/scripts/ispconfig_update.sh', 'root');
20122012
chmod($install_dir.'/server/scripts/ispconfig_update.sh', 0700);
2013-
if(!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_svn.sh');
2013+
if(!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_dev.sh');
20142014
if(!is_link('/usr/local/bin/ispconfig_update.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update.sh');
20152015

20162016
//* Make the logs readable for the ispconfig user

‎server/scripts/ispconfig_update.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function simple_query($query, $answers, $default)
100100
echo "There are no updates available for ISPConfig ".ISPC_APP_VERSION."\n";
101101
}
102102
} else {
103-
passthru('/usr/local/ispconfig/server/scripts/update_from_svn.sh');
103+
passthru('/usr/local/ispconfig/server/scripts/update_from_dev.sh');
104104
exit;
105105
}
106106

‎server/scripts/update_from_dev.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
cd /tmp
4+
wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=master"
5+
tar xzf ispconfig3-dev.tar.gz
6+
cd ispconfig3.git/install
7+
php -q update.php
8+
cd /tmp
9+
rm -rf /tmp/ispconfig3.git /tmp/ispconfig3-dev.tar.gz
10+
11+
exit 0

‎server/scripts/update_from_svn.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#!/bin/bash
22

3-
cd /tmp
4-
svn export svn://svn.ispconfig.org/ispconfig3/trunk/
5-
cd trunk/install
6-
php -q update.php
7-
cd /tmp
8-
rm -rf /tmp/trunk
3+
CUR=`dirname $0`
4+
bash ${CUR}/update_from_dev.sh
95

106
exit 0

0 commit comments

Comments
 (0)