- fixed unlinking of hhvm init script

Marius Cramer · Marius Cramer · commit cdb2c68b7891 · 2015-02-03T11:03:20.000+01:00
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -2778,7 +2778,7 @@ private function hhvm_update($data, $web_config) {
  		} elseif($data['new']['php'] != 'hhvm' && $data['old']['php'] == 'hhvm') {
 			exec('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' stop >/dev/null 2>&1');
 			exec('/usr/sbin/update-rc.d hhvm_' . $data['old']['system_user'] . ' remove >/dev/null 2>&1');
-			unlink('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' >/dev/null 2>&1');
+			unlink('/etc/init.d/hhvm_' . $data['old']['system_user']);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2778,7 +2778,7 @@ private function hhvm_update($data, $web_config) {`
`2778`	`2778`	`} elseif($data['new']['php'] != 'hhvm' && $data['old']['php'] == 'hhvm') {`
`2779`	`2779`	`exec('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' stop >/dev/null 2>&1');`
`2780`	`2780`	`exec('/usr/sbin/update-rc.d hhvm_' . $data['old']['system_user'] . ' remove >/dev/null 2>&1');`
`2781`		`- unlink('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' >/dev/null 2>&1');`
	`2781`	`+ unlink('/etc/init.d/hhvm_' . $data['old']['system_user']);`
`2782`	`2782`	`}`
`2783`	`2783`	`}`
`2784`	`2784`