[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12871] setup: more on svn update
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12871] setup: more on svn update |
|
Date: |
Wed, 18 Mar 2015 18:12:04 +0000 |
Revision: 12871
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12871
Author: sigurdne
Date: 2015-03-18 18:12:03 +0000 (Wed, 18 Mar 2015)
Log Message:
-----------
setup: more on svn update
Modified Paths:
--------------
trunk/setup/index.php
trunk/setup/templates/base/setup_main.tpl
trunk/setup/templates/base/setup_svn_blocks.tpl
Modified: trunk/setup/index.php
===================================================================
--- trunk/setup/index.php 2015-03-17 23:33:35 UTC (rev 12870)
+++ trunk/setup/index.php 2015-03-18 18:12:03 UTC (rev 12871)
@@ -24,7 +24,7 @@
'noapi' => True,
'nocachecontrol' => True
);
-
+
/**
* Include setup functions
*/
@@ -183,9 +183,9 @@
$GLOBALS['phpgw_setup']->html->show_footer();
exit;
}
-
+
// BEGIN setup page
-
+
//$GLOBALS['phpgw_setup']->app_status();
$GLOBALS['phpgw_info']['server']['app_images'] =
'templates/base/images';
$GLOBALS['phpgw_info']['server']['api_images'] =
'../phpgwapi/templates/base/images';
@@ -195,20 +195,30 @@
$setup_tpl->set_var('img_incomplete', $incomplete);
$setup_tpl->set_var('img_completed', $completed);
- $setup_tpl->set_var('svn_step_text',lang('Step 0 - check for updates'));
+ $setup_tpl->set_var('svn_step_text',lang('Step 0 - check for updates.
The user %1 has to be member of sudoers and have a
password',getenv('APACHE_RUN_USER')));
$setup_tpl->set_var('db_step_text',lang('Step 1 - Simple Application
Management'));
switch($GLOBALS['phpgw_info']['setup']['stage']['svn'])
{
case 1:
- $setup_tpl->set_var('dry_run',lang('show-updates'));
- $setup_tpl->set_var('svnwarn',lang('will try to perform
a svn status'));
+ $setup_tpl->set_var('sudo_user',lang('sudo user'));
+ $setup_tpl->set_var('sudo_password',lang('sudo
password'));
+ $setup_tpl->set_var('svnwarn',lang('will try to perform
a svn status -u'));
$setup_tpl->set_var('check_for_svn_update',lang('check
update'));
$_svn_message = '';
if($GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] ==
'perform_svn_update')
{
+ $sudo_user =
phpgw::get_var('sudo_user');
+ $sudo_password =
phpgw::get_var('sudo_password');
+
+ $tmpfname = tempnam(sys_get_temp_dir(), "SVN");
+ $handle = fopen($tmpfname, "w+");
+ fwrite($handle, "{$sudo_password}\n");
+ fclose($handle);
putenv('LANG=en_US.UTF-8');
- exec('svn up ' . PHPGW_SERVER_ROOT . '
--config-dir /etc/subversion 2>&1', $output, $returnStatus);
+ $_command = "sudo -u {$sudo_user} -S svn up " .
PHPGW_SERVER_ROOT . " --config-dir /etc/subversion < {$tmpfname} 2>&1";
+ exec($_command, $output, $returnStatus);
+ unlink($tmpfname);
$_svn_message = '<pre>' . print_r($output,true)
. '</pre>';
}
$setup_tpl->set_var('svn_message',$_svn_message);
@@ -218,14 +228,29 @@
break;
case 2:
+ $setup_tpl->set_var('sudo_user',lang('sudo user'));
+ $setup_tpl->set_var('value_sudo_user',
phpgw::get_var('sudo_user'));
+ $setup_tpl->set_var('value_sudo_password',
phpgw::get_var('sudo_password'));
+ $setup_tpl->set_var('sudo_password',lang('sudo
password'));
$setup_tpl->set_var('perform_svn_update',lang('perform
svn update'));
+ $setup_tpl->set_var('sudo_user',lang('sudo user'));
+ $setup_tpl->set_var('sudo_password',lang('sudo
password'));
$setup_tpl->set_var('execute',lang('execute'));
$setup_tpl->set_var('svnwarn',lang('will try to perform
a svn up'));
$_svn_message = '';
if($GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] ==
'check_for_svn_update')
{
+ $sudo_user =
phpgw::get_var('sudo_user');
+ $sudo_password =
phpgw::get_var('sudo_password');
+
+ $tmpfname = tempnam(sys_get_temp_dir(), "SVN");
+ $handle = fopen($tmpfname, "w+");
+ fwrite($handle, "{$sudo_password}\n");
+ fclose($handle);
putenv('LANG=en_US.UTF-8');
- exec('svn status -u ' . PHPGW_SERVER_ROOT . '
--config-dir /etc/subversion 2>&1', $output, $returnStatus);
+ $_command = "sudo -u {$sudo_user} -S svn status
-u " . PHPGW_SERVER_ROOT . " --config-dir /etc/subversion < {$tmpfname} 2>&1";
+ exec($_command, $output, $returnStatus);
+ unlink($tmpfname);
$_svn_message = '<pre>' . print_r($output,true)
. '</pre>';
}
$setup_tpl->set_var('svn_message',$_svn_message);
@@ -310,7 +335,7 @@
$setup_tpl->set_var('tblchange',lang('Table Change
Messages'));
$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
$db_filled_block =
$setup_tpl->get_var('V_db_stage_6_pre');
-
+
flush();
//ob_start();
$GLOBALS['phpgw_setup']->db->Halt_On_Error = 'yes';
Modified: trunk/setup/templates/base/setup_main.tpl
===================================================================
--- trunk/setup/templates/base/setup_main.tpl 2015-03-17 23:33:35 UTC (rev
12870)
+++ trunk/setup/templates/base/setup_main.tpl 2015-03-18 18:12:03 UTC (rev
12871)
@@ -2,8 +2,7 @@
<!-- begin the svn section -->
<table border="0" width="100%" cellspacing="0" cellpadding="2" style="{border:
1px solid #000000;}">
<tr class="th">
- <td align="left">{svn_step_text}</td>
- <td align="right"> </td>
+ <td align="left" colspan="2">{svn_step_text}</td>
</tr>
{V_svn_filled_block}
Modified: trunk/setup/templates/base/setup_svn_blocks.tpl
===================================================================
--- trunk/setup/templates/base/setup_svn_blocks.tpl 2015-03-17 23:33:35 UTC
(rev 12870)
+++ trunk/setup/templates/base/setup_svn_blocks.tpl 2015-03-18 18:12:03 UTC
(rev 12871)
@@ -10,8 +10,25 @@
<td>
{check_for_svn_update}
<form method="POST" action="index.php">
- {dry_run}:
- <input type="hidden" name="action_svn" value="check_for_svn_update">
+ <input type="hidden" name="action_svn"
value="check_for_svn_update">
+ <table>
+ <tr>
+ <td>
+ {sudo_user}:
+ </td>
+ <td>
+ <input type="text" name="sudo_user"
value="">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ {sudo_password}:
+ </td>
+ <td>
+ <input type="password"
name="sudo_password" value="">
+ </td>
+ </tr>
+ </table>
<input type="submit" name="label"
value="{check_for_svn_update}"><br>({svnwarn})
</form>
{svn_message}
@@ -31,6 +48,25 @@
<form method="POST" action="index.php">
{execute}:
<input type="hidden" name="action_svn" value="perform_svn_update">
+ <table>
+ <tr>
+ <td>
+ {sudo_user}:
+ </td>
+ <td>
+ <input type="text" name="sudo_user"
value="{value_sudo_user}">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ {sudo_password}:
+ </td>
+ <td>
+ <input type="password"
name="sudo_password" value="{value_sudo_password}">
+ </td>
+ </tr>
+ </table>
+
<input type="submit" name="label"
value="{perform_svn_update}"><br>({svnwarn})
</form>
{svn_message}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12871] setup: more on svn update,
Sigurd Nes <=