Skip to content
Browse files

Change to GIT version control system.

  • Loading branch information...
1 parent 1f0c1fc commit ab9cffb25ac32d037588e1dd475c6f5b65128da5 @dterweij dterweij committed Nov 6, 2011
View
10 hypervm-install/make-distribution.sh
@@ -2,8 +2,8 @@
#
# HyperVM, Server Virtualization GUI for OpenVZ and Xen
#
-# Copyright (C) 2000-2009 LxLabs
-# Copyright (C) 2009 LxCenter
+# Copyright (C) 2000-2009 LxLabs
+# Copyright (C) 2009-2011 LxCenter
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
#
-# This file creates hypervm-install.zip for distribution from SVN.
+# This file creates hypervm-install.zip for distribution.
# Please note to server admins, if install-hypervm-master/slave.sh is changed,
# update them on download server too.
#
@@ -32,8 +32,10 @@ echo "### ......"
zip -rq hypervm-install.zip ../hypervm-install -x \
"../hypervm-install/CVS/*" \
"../hypervm-install/.svn/*" \
+"../hypervm-install/.git/*" \
"../hypervm-install/hypervm-linux/CVS/*" \
-"../hypervm-install/hypervm-linux/.svn/*"
+"../hypervm-install/hypervm-linux/.svn/*" \
+"../hypervm-install/hypervm-linux/.git/*"
####
echo "### hypervm-install.zip created."
echo "##########################################"
View
4 hypervm/bin/update.php
@@ -2,9 +2,11 @@
include_once "htmllib/lib/include.php";
include_once "lib/updatelib.php";
include_once "htmllib/lib/updatelib.php";
-if (lxfile_exists("CVS")) {
+
+if (lxfile_exists("CVS") | lxfile_exists("svn") | lxfile_exists("git")) {
print("Development Version found, just go on.\n");
// exit;
}
+
exit_if_another_instance_running();
update_main();
View
4 hypervm/httpdocs/htmllib/phplib/lxlib.php
@@ -209,7 +209,7 @@ function lscandir_without_dot($arg, $dotflag = false)
}
foreach ($list as $k => $v) {
- if ($v === ".." || $v === "." || $v === '.svn') {
+ if ($v === ".." || $v === "." || $v === '.svn' || $v === '.git') {
unset($list[$k]);
}
if ($dotflag && csb($v, '.')) {
@@ -228,7 +228,7 @@ function lscandir_without_dot_or_underscore($arg, $dotflag = false)
}
foreach ($list as $k => $v) {
- if ($v === ".." || $v === "." || $v === '.svn') {
+ if ($v === ".." || $v === "." || $v === '.svn' || $v === '.git') {
unset($list[$k]);
}
if ($dotflag && csb($v, '.')) {
View
7 hypervm/make-distribution.sh
@@ -2,7 +2,7 @@
# HyperVM, Server Virtualization GUI for OpenVZ and Xen
#
# Copyright (C) 2000-2009 LxLabs
-# Copyright (C) 2009-2010 LxCenter
+# Copyright (C) 2009-2011 LxCenter
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,7 @@
#
#
#
-# This file creates hypervm-[version].zip for distribution from SVN.
+# This file creates hypervm-[version].zip for distribution.
#
#
# - read version
@@ -30,7 +30,7 @@ echo "################################"
echo "### Start packaging"
echo "### read version..."
# Read version
-# Please note, this must be a running machine with SVN version!
+# Please note, this must be a running (HyperVM installed) machine (Development/Test/Release server)
if ! [ -f /script/version ] ; then
echo "## Packaging failed. No /script/version found."
echo "## Are you sure you are running a development version?"
@@ -56,6 +56,7 @@ echo "### Create zip package..."
# Package part
zip -r9 hypervm-$version.zip ./bin ./cexe ./file ./httpdocs ./pscript ./sbin ./RELEASEINFO -x \
"*/CVS/*" \
+"*/.git/* \
"*/.svn/*"
#
echo "### Finished"

0 comments on commit ab9cffb

Please sign in to comment.
Something went wrong with that request. Please try again.