From: Maps <maps@ikf>
Date: Thu, 20 Jun 2013 17:27:01 +0000 (+0200)
Subject: changes to everything
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=ea508a503c8708d0e1104f63111732b3ce00b323;p=mvdsensorcontrol.git

changes to everything
---

diff --git a/.gitignore b/.gitignore
index 29e33c3..0a40453 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@ devel
 *~
 *bak
 .kateproject
-
+temp
diff --git a/config/README.txt b/config/README.txt
new file mode 100644
index 0000000..bc654ca
--- /dev/null
+++ b/config/README.txt
@@ -0,0 +1 @@
+Here are all configuration files that should stay on the server and not be overwritten with a normal update.
diff --git a/index.pl b/index.pl
index 57a56e0..6a2d59d 100755
--- a/index.pl
+++ b/index.pl
@@ -37,8 +37,8 @@ Guess what? We didn't write any!
 <ul>
 <li><a href="tools/gitupdate.pl?stable">Check-out the stable branch without config files</a>
 <li><a href="tools/gitupdate.pl?stable-config">Check-out the stable branch with config files</a>
-<li><a href="tools/gitupdate.pl?devel">Check-out the devel branch without config files</a>
-<li><a href="tools/gitupdate.pl?devel-config">Check-out the devel branch with config files</a>
+<!--<li><a href="tools/gitupdate.pl?devel">Check-out the devel branch without config files</a>
+<li><a href="tools/gitupdate.pl?devel-config">Check-out the devel branch with config files</a>-->
 </div>
 
 </body>
diff --git a/temp/README.txt b/temp/README.txt
new file mode 100644
index 0000000..8399015
--- /dev/null
+++ b/temp/README.txt
@@ -0,0 +1,3 @@
+Here are all temporary files that are not supposed to be in /tmp for whatever reason.
+
+Don't put a file named 'config' here, it will be deleted!
diff --git a/tools/gitupdate.pl b/tools/gitupdate.pl
old mode 100644
new mode 100755
index 8b13789..56faf7c
--- a/tools/gitupdate.pl
+++ b/tools/gitupdate.pl
@@ -1 +1,44 @@
+#!/usr/bin/perl
+print "Content-type: text/plain\n";
+print "\n\n";
+
+use warnings;
+use Data::Dumper;
+use CGI::Carp qw(fatalsToBrowser);
+
+my $query = $ENV{'QUERY_STRING'};
+
+sub cmd {
+	my @x = qx(cmd." 2>&1");
+	print Dumper @x;
+}
+
+
+print "Running Git Update\n";
+
+unless ($query =~ m/stable/) {
+	print "Function not implemented.\n";
+	exit;
+	}
+
+
+unless ($query =~ m/config/) {
+	print "Copying configuration file folder\n";
+	cmd("cp -r ../config ../temp/config");
+	}
+
+
+print "Undoing changes in config files\n";
+cmd("git checkout -- ../config ../temp");
+
+
+unless ($query =~ m/config/) {
+	print "Copying configuration file folder back\n";
+	cmd("cp -r ../temp/config  ../");
+
+	print "Removing temporary configuration file folder\n";
+	cmd("rm -r ../temp/config");
+	}
+
+