Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
b34f99da
Commit
b34f99da
authored
Feb 10, 2014
by
Marius Cramer
Browse files
Updated script to install development version to match switch from svn to git
parent
eb3ab433
Changes
7
Hide whitespace changes
Inline
Side-by-side
install/dist/lib/fedora.lib.php
View file @
b34f99da
...
...
@@ -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
...
...
install/dist/lib/gentoo.lib.php
View file @
b34f99da
...
...
@@ -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'
))
{
...
...
install/dist/lib/opensuse.lib.php
View file @
b34f99da
...
...
@@ -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
...
...
install/lib/installer_base.lib.php
View file @
b34f99da
...
...
@@ -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
...
...
server/scripts/ispconfig_update.php
View file @
b34f99da
...
...
@@ -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
;
}
...
...
server/scripts/update_from_dev.sh
0 → 100644
View file @
b34f99da
#!/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
server/scripts/update_from_svn.sh
View file @
b34f99da
#!/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
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment