From b34f99dabb9ee413856344652e91bff831d3919a Mon Sep 17 00:00:00 2001 From: Marius Cramer Date: Mon, 10 Feb 2014 15:10:48 +0100 Subject: [PATCH] Updated script to install development version to match switch from svn to git --- install/dist/lib/fedora.lib.php | 8 ++++---- install/dist/lib/gentoo.lib.php | 12 ++++++------ install/dist/lib/opensuse.lib.php | 8 ++++---- install/lib/installer_base.lib.php | 8 ++++---- server/scripts/ispconfig_update.php | 2 +- server/scripts/update_from_dev.sh | 11 +++++++++++ server/scripts/update_from_svn.sh | 8 ++------ 7 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 server/scripts/update_from_dev.sh diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index bdb72a2aff..666d31573d 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -1142,14 +1142,14 @@ class installer_dist extends installer_base { //exec('chmod +r /var/log/clamav/freshclam.log'); //* Install the update script - if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh'); - exec('chown root /usr/local/ispconfig/server/scripts/update_from_svn.sh'); - exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_svn.sh'); + if(is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) unlink('/usr/local/bin/ispconfig_update_from_dev.sh'); + exec('chown root /usr/local/ispconfig/server/scripts/update_from_dev.sh'); + exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_dev.sh'); exec('chown root /usr/local/ispconfig/server/scripts/update_from_tgz.sh'); exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_tgz.sh'); exec('chown root /usr/local/ispconfig/server/scripts/ispconfig_update.sh'); exec('chmod 700 /usr/local/ispconfig/server/scripts/ispconfig_update.sh'); - 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'); + 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'); 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'); // set the fast cgi starter script to executable diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index f9b5a8bc42..a47f0d063a 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -990,19 +990,19 @@ class installer extends installer_base } //* Install the update script - if (is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) { - unlink('/usr/local/bin/ispconfig_update_from_svn.sh'); + if (is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) { + unlink('/usr/local/bin/ispconfig_update_from_dev.sh'); } - chown($install_dir.'/server/scripts/update_from_svn.sh', 'root'); - chmod($install_dir.'/server/scripts/update_from_svn.sh', 0700); + chown($install_dir.'/server/scripts/update_from_dev.sh', 'root'); + chmod($install_dir.'/server/scripts/update_from_dev.sh', 0700); chown($install_dir.'/server/scripts/update_from_tgz.sh', 'root'); chmod($install_dir.'/server/scripts/update_from_tgz.sh', 0700); chown($install_dir.'/server/scripts/ispconfig_update.sh', 'root'); chmod($install_dir.'/server/scripts/ispconfig_update.sh', 0700); - 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'); + 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'); } if (!is_link('/usr/local/bin/ispconfig_update.sh')) { diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index e104f4abe2..462a694998 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -1193,14 +1193,14 @@ class installer_dist extends installer_base { //exec('chmod +r /var/log/clamav/freshclam.log'); //* Install the update script - if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh'); - exec('chown root /usr/local/ispconfig/server/scripts/update_from_svn.sh'); - exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_svn.sh'); + if(is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) unlink('/usr/local/bin/ispconfig_update_from_dev.sh'); + exec('chown root /usr/local/ispconfig/server/scripts/update_from_dev.sh'); + exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_dev.sh'); exec('chown root /usr/local/ispconfig/server/scripts/update_from_tgz.sh'); exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_tgz.sh'); exec('chown root /usr/local/ispconfig/server/scripts/ispconfig_update.sh'); exec('chmod 700 /usr/local/ispconfig/server/scripts/ispconfig_update.sh'); - 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'); + 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'); 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'); //set the fast cgi starter script to executable diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 1f691aed32..51d2495226 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -2003,14 +2003,14 @@ class installer_base { } //* Install the update script - if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh'); - chown($install_dir.'/server/scripts/update_from_svn.sh', 'root'); - chmod($install_dir.'/server/scripts/update_from_svn.sh', 0700); + if(is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) unlink('/usr/local/bin/ispconfig_update_from_dev.sh'); + chown($install_dir.'/server/scripts/update_from_dev.sh', 'root'); + chmod($install_dir.'/server/scripts/update_from_dev.sh', 0700); chown($install_dir.'/server/scripts/update_from_tgz.sh', 'root'); chmod($install_dir.'/server/scripts/update_from_tgz.sh', 0700); chown($install_dir.'/server/scripts/ispconfig_update.sh', 'root'); chmod($install_dir.'/server/scripts/ispconfig_update.sh', 0700); - 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'); + 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'); if(!is_link('/usr/local/bin/ispconfig_update.sh')) symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update.sh'); //* Make the logs readable for the ispconfig user diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php index 9bdf729e85..1001f4f5a2 100644 --- a/server/scripts/ispconfig_update.php +++ b/server/scripts/ispconfig_update.php @@ -100,7 +100,7 @@ if($method == 'stable') { echo "There are no updates available for ISPConfig ".ISPC_APP_VERSION."\n"; } } else { - passthru('/usr/local/ispconfig/server/scripts/update_from_svn.sh'); + passthru('/usr/local/ispconfig/server/scripts/update_from_dev.sh'); exit; } diff --git a/server/scripts/update_from_dev.sh b/server/scripts/update_from_dev.sh new file mode 100644 index 0000000000..de93fd9672 --- /dev/null +++ b/server/scripts/update_from_dev.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +cd /tmp +wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=master" +tar xzf ispconfig3-dev.tar.gz +cd ispconfig3.git/install +php -q update.php +cd /tmp +rm -rf /tmp/ispconfig3.git /tmp/ispconfig3-dev.tar.gz + +exit 0 \ No newline at end of file diff --git a/server/scripts/update_from_svn.sh b/server/scripts/update_from_svn.sh index d8ed23657c..8c8ee2ae18 100644 --- a/server/scripts/update_from_svn.sh +++ b/server/scripts/update_from_svn.sh @@ -1,10 +1,6 @@ #!/bin/bash -cd /tmp -svn export svn://svn.ispconfig.org/ispconfig3/trunk/ -cd trunk/install -php -q update.php -cd /tmp -rm -rf /tmp/trunk +CUR=`dirname $0` +bash ${CUR}/update_from_dev.sh exit 0 \ No newline at end of file -- GitLab