summaryrefslogtreecommitdiffstats
path: root/tmp
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-03-13 23:28:12 +0545
committerPhil Davis <phil.davis@inf.org>2015-03-13 23:28:12 +0545
commit7d61beba45e06f4be2fc5436f14e879ec7dd2675 (patch)
tree15d21def93d92267bc1be37e0a4b15846ae358c9 /tmp
parentf2f34088ace895b0113b468b856ceb02301585d1 (diff)
downloadpfsense-7d61beba45e06f4be2fc5436f14e879ec7dd2675.zip
pfsense-7d61beba45e06f4be2fc5436f14e879ec7dd2675.tar.gz
Code Style sbin tmp usr
Bits and pieces from sbin tmp and usr but not yet usr/local/www
Diffstat (limited to 'tmp')
-rwxr-xr-xtmp/post_upgrade_command.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/tmp/post_upgrade_command.php b/tmp/post_upgrade_command.php
index a33dbb6..c2b6901 100755
--- a/tmp/post_upgrade_command.php
+++ b/tmp/post_upgrade_command.php
@@ -6,18 +6,21 @@
require_once("config.inc");
require_once("functions.inc");
- if(file_exists("/usr/local/bin/git") && isset($config['system']['gitsync']['synconupgrade'])) {
- if(!empty($config['system']['gitsync']['repositoryurl']))
+ if (file_exists("/usr/local/bin/git") && isset($config['system']['gitsync']['synconupgrade'])) {
+ if (!empty($config['system']['gitsync']['repositoryurl'])) {
exec("cd /root/pfsense/pfSenseGITREPO/pfSenseGITREPO && git config remote.origin.url " . escapeshellarg($config['system']['gitsync']['repositoryurl']));
- if(!empty($config['system']['gitsync']['branch']))
+ }
+ if (!empty($config['system']['gitsync']['branch'])) {
system("pfSsh.php playback gitsync " . escapeshellarg($config['system']['gitsync']['branch']) . " --upgrading");
+ }
}
$newslicedir = "";
- if (isset($argv[1]) && $argv[1] != "")
+ if (isset($argv[1]) && $argv[1] != "") {
$newslicedir = '/tmp/' . $argv[1];
+ }
- if($g['enableserial_force'] || file_exists("{$newslicedir}/enableserial_force")) {
+ if ($g['enableserial_force'] || file_exists("{$newslicedir}/enableserial_force")) {
$config['system']['enableserial'] = true;
write_config();
}
OpenPOWER on IntegriCloud