From: Jan Michel <j.michel@gsi.de>
Date: Tue, 6 Aug 2013 16:23:59 +0000 (+0200)
Subject: created Environment.pm with all important hardcoded settings
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=510cc2b6a7c8d01e92bde2e2ad2a3c59caa1c492;p=mvdsensorcontrol.git

created Environment.pm with all important hardcoded settings
---

diff --git a/tools/run.pl b/tools/run.pl
index 55e62b2..05fef49 100755
--- a/tools/run.pl
+++ b/tools/run.pl
@@ -7,12 +7,7 @@ use strict;
 use warnings;
 use POSIX;
 use CGI ':standard';
-<<<<<<< HEAD
 # use Cwd;
-=======
-
-use Cwd;
->>>>>>> 23c29745c883ce981ed72e273f6aac8ccccab503
 use CGI::Carp qw(fatalsToBrowser);
 use HTML::Entities;
 # require Common;
@@ -43,14 +38,10 @@ if( $q->param('runtime') ) {
   $runtime = $q->param('runtime');
 }
 
-<<<<<<< HEAD
 # print escapeHTML("hallo<<<>>>&&&!!"),br;
 # print escapeHTML($here);
 # $ENV{'PATH'}=$ENV{'PATH'}.":/home/hadaq/bin";
 # $ENV{'PATH'}=$ENV{'PATH'}.":/local.1/bastelstube/daqdata/bin";
-=======
-$ENV{'PATH'}=$ENV{'PATH'}.":/local.1/bastelstube/daqdata/bin";
->>>>>>> 23c29745c883ce981ed72e273f6aac8ccccab503
 # print br,$ENV{'PATH'},br;
 # $ENV{'JTAGPATH'}="/local.1/jtag_mvd/soft/toolbox/jtag_atomic/";
 # $ENV{'DAQOPSERVER'}="localhost:7";
@@ -63,13 +54,7 @@ unless(-e $picPath or mkdir $picPath) {
   die "Unable to create $picPath\n";
 }
 
-<<<<<<< HEAD
 system("./startup.pl ".SETUPFILE);
-chdir("preview");
-=======
-system("./startup.pl ../setup/testsetup.xml");
-# chdir("preview");
->>>>>>> 23c29745c883ce981ed72e273f6aac8ccccab503
 
 my $dummy;