From 7d61beba45e06f4be2fc5436f14e879ec7dd2675 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Fri, 13 Mar 2015 23:28:12 +0545 Subject: Code Style sbin tmp usr Bits and pieces from sbin tmp and usr but not yet usr/local/www --- tmp/post_upgrade_command.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'tmp') 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(); } -- cgit v1.1