Fix services saving in ArchLinux.

1 files changed, 17 insertions, 5 deletions

diff --git a/Init/Services.pm b/Init/Services.pm
index 675262f..0e0c139 100644
--- a/Init/Services.pm
+++ b/Init/Services.pm
@@ -978,19 +978,31 @@ sub set_archlinux_service_status
   my ($script, $active) = @_;
   my $rcconf = '/etc/rc.conf';
   my ($daemons);
+
   $daemons = &Utils::Parse::get_sh ($rcconf, "DAEMONS");
-  $daemons =~ s/[()]//;
+  $daemons =~ s/[\(\)]//g;
+
+  # escape these chars
+  $script =~ s/([\\\.\^\$\*\+\?\{\}\[\]\(\)\|])/\\\1/g;
+  $notscript = "\!" . $script;
 
-  if (($daemons =~ m/$script/) && !$active)
+  if (($daemons =~ m/$notscript/) && $active)
+  {
+    # It was disabled, enable it
+    $daemons =~ s/$notscript/$script/g;
+  }
+  elsif (($daemons =~ m/$script/) && !$active)
   {
-    $daemons =~ s/$script[ \t]*//;
+    # It was enabled, disable it
+    $daemons =~ s/$script/$notscript/g;
   }
   elsif (($daemons !~ m/$script/) && $active)
   {
-    $daemons =~ s/network/network $script/g;
+    $daemons .= " ".$script;
   }
 
-  &Utils::Replace::set_sh ($rcconf, "DAEMONS", "($daemons)", 1);
+  $daemons = "(" . $daemons . ")";
+  &Utils::Replace::set_sh ($rcconf, "DAEMONS", $daemons, 1);
   &run_rcng_script ($service, ($active) ? "start" : "stop");
 }