Updated script to install development version to match switch from svn to git

Marius Cramer

2014-02-10 b34f99dabb9ee413856344652e91bff831d3919a

Updated script to install development version to match switch from svn to git

 install/dist/lib/fedora.lib.php

@@ -1142,14 +1142,14 @@
        //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

 install/dist/lib/gentoo.lib.php

@@ -990,19 +990,19 @@
        }

        //* 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')) {

 install/dist/lib/opensuse.lib.php

@@ -1193,14 +1193,14 @@
        //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

 install/lib/installer_base.lib.php

@@ -2003,14 +2003,14 @@
        }

        //* 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

 server/scripts/ispconfig_update.php

@@ -100,7 +100,7 @@
        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;
}


 server/scripts/update_from_dev.sh

New file
@@ -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

 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