Clean out code for windows.

perlDreamer · perlDreamer · commit f62fd7c6721c · 2012-01-06T13:00:03.000-08:00
diff --git a/wre/lib/WRE/Config.pm b/wre/lib/WRE/Config.pm
@@ -57,7 +57,6 @@ necessary.
 
 sub getRoot {
     my ($self,$path) = @_;
-    my $volume = WRE::Host->new(wreConfig => $self)->getOsName eq 'windows' ? 'c:' : '';
     my $root = dir("/data/wre");
     if (defined $path) {
         return $root->file($path)->stringify;    
diff --git a/wre/lib/WRE/File.pm b/wre/lib/WRE/File.pm
@@ -62,14 +62,12 @@ sub changeOwner {
     my $self = shift;
     my $path = shift;
     my $host = WRE::Host->new(wreConfig=>$self->wreConfig);
-    if ($host->getOsName ne "windows") {
-        my $refId = id $self;
-        if ($groupId{$refId} eq "" || $userId{$refId} eq "") {
-            my $user = $self->wreConfig->get("user");
-            (undef, undef, $userId{$refId}, $groupId{$refId}) = getpwnam $user or carp $user." not in passwd file";
-        }
-        chown $userId{$refId}, $groupId{$refId}, $path;
+    my $refId = id $self;
+    if ($groupId{$refId} eq "" || $userId{$refId} eq "") {
+        my $user = $self->wreConfig->get("user");
+        (undef, undef, $userId{$refId}, $groupId{$refId}) = getpwnam $user or carp $user." not in passwd file";
     }
+    chown $userId{$refId}, $groupId{$refId}, $path;
 }
 
 
diff --git a/wre/lib/WRE/Host.pm b/wre/lib/WRE/Host.pm
@@ -103,21 +103,9 @@ sub getOsType {
         elsif ( -f "/etc/fedora-release" ) {
             return "Fedora";
         } 
-        elsif ( -f "/etc/slackware-release" || -f "/etc/slackware-version" ) {
-            return "Slackware";
-        }
         elsif ( -f "/etc/debian_release" || -f "/etc/debian_version" ) {
             return "Debian";
         }
-        elsif ( -f "/etc/mandrake-release" ) {
-            return "Mandrake";
-        }
-        elsif ( -f "/etc/yellowdog-release" ) {
-            return "YellowDog";
-        }
-        elsif ( -f "/etc/gentoo-release" ) {
-            return "Gentoo";
-        }
         elsif ( -f "/etc/lsb-release" ) {
             return "Ubuntu";
         }
@@ -150,9 +138,6 @@ Returns a boolean indicating whether the current user is a privileged user for t
 
 sub isPrivilegedUser {
     my $self = shift;
-    if ($self->getOsName eq "windows" || $< == 0) {
-        return 1;
-    }
     return 0;
 }
 
diff --git a/wre/lib/WRE/Spectre.pm b/wre/lib/WRE/Spectre.pm
@@ -136,13 +136,8 @@ sub start {
     $wreConfig->set("wreMonitor/spectreAdministrativelyDown", 0);
     my $host = WRE::Host->new(wreConfig => $wreConfig);
     my $cmd = "";
-    if ($host->getOsName eq "windows") {
-        $cmd = "net start WREspectre";
-    }
-    else {
-        chdir $wreConfig->getWebguiRoot("/sbin");
-        $cmd = $wreConfig->getRoot("/prereqs/bin/perl")." spectre.pl --daemon";
-    }
+    chdir $wreConfig->getWebguiRoot("/sbin");
+    $cmd = $wreConfig->getRoot("/prereqs/bin/perl")." spectre.pl --daemon";
     system($cmd);
     while ($count < 10 && $success == 0) {
         sleep(1);
@@ -168,13 +163,8 @@ sub stop {
     $wreConfig->set("wreMonitor/spectreAdministrativelyDown", 1);
     my $host = WRE::Host->new(wreConfig => $wreConfig);
     my $cmd = "";
-    if ($host->getOsName eq "windows") {
-        $cmd = "net stop WREspectre";
-    }
-    else {
-        chdir($wreConfig->getWebguiRoot("/sbin"));
-        $cmd = $wreConfig->getRoot("/prereqs/bin/perl")." spectre.pl --shutdown";
-    }
+    chdir($wreConfig->getWebguiRoot("/sbin"));
+    $cmd = $wreConfig->getRoot("/prereqs/bin/perl")." spectre.pl --shutdown";
     `$cmd`; # catch command line output
     while ($count < 10 && $success == 1) {
         sleep(1);
