X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rpm%2Fbuild%2Fenrpm;fp=rpm%2Fbuild%2Fenrpm;h=3e674bc3adb7a9ca4be7d9a9eca108c16e8ad947;hp=11f69ba567432219ee88470757172e54ec5a5263;hb=6acca6cb3da731f22fee44d8f3dd11631cd37189;hpb=6c674902ea0fb10bfa35a3f3eef70c9ca76feaad

diff --git a/rpm/build/enrpm b/rpm/build/enrpm
index 11f69ba56..3e674bc3a 100755
--- a/rpm/build/enrpm
+++ b/rpm/build/enrpm
@@ -93,22 +93,13 @@ sub usage {
 }
 
 # Feeble excuse for not having a real configuration file
-my $user = 'rsiddall';
-my $buildsys = '/home/rsiddall/work';
-my $rembuild = '/home/rsiddall/work/cvs';
-my $remdeps = '/home/rsiddall';
-my $rpmtopdir = '/home/rsiddall/work/redhat';
-my $packager = 'Richard Siddall <richard.siddall@elirion.net>';
-my $server = 'grosbeak';
-
-if (hostname =~ /wavetail/i) {
-	$buildsys = '/home/rsiddall/buildsys';
-	$rembuild = '/home/rsiddall/buildsys/ref';
-	$remdeps = '/home/rsiddall';
-	$rpmtopdir = '/home/rsiddall/redhat';
-	$packager = 'Ivan Kohler <ivan@freeside.biz>';
-	$server = '10.5.4.5';
-}
+my $user = 'ivan';
+my $buildsys = "/home/$user/buildsys";
+#my $rembuild = '/home/rsiddall/buildsys/ref';
+my $remdeps = '/home/ivan';
+my $rpmtopdir = "/home/$user/redhat";
+my $packager = 'Ivan Kohler <ivan@freeside.biz>';
+my $server = '10.5.4.5';
 
 $server = $opts{server} if defined($opts{server});
 $user = $1 if $server =~ /(\w+)\@[\w\d\.]+/;
@@ -169,11 +160,11 @@ for my $file (@ARGV) {
 	}
 	my $olddir = getcwd();
 	do_cmd("$buildsys/build-freeside");
-	if (-x "$buildsys/refresh-repo") {
+#	if (-x "$buildsys/refresh-repo") {
 		do_cmd("$buildsys/refresh-repo");
-	} else {
-		do_cmd("ssh $user\@$server $rembuild/refresh-repo");
-	}
+#	} else {
+#		do_cmd("ssh $user\@$server $rembuild/refresh-repo");
+#	}
 }
 
 sub do_cmd {