From ff9fe5be0e0ac74625e5ae1538a548eaabc0d5a8 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 25 Mar 2017 08:26:56 +0100
Subject: pull latest changes from Fedora + cron on EL6

---
 owncloud-9.1.4-correct-cli-upgrade.patch | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 owncloud-9.1.4-correct-cli-upgrade.patch

(limited to 'owncloud-9.1.4-correct-cli-upgrade.patch')

diff --git a/owncloud-9.1.4-correct-cli-upgrade.patch b/owncloud-9.1.4-correct-cli-upgrade.patch
new file mode 100644
index 0000000..79a8593
--- /dev/null
+++ b/owncloud-9.1.4-correct-cli-upgrade.patch
@@ -0,0 +1,30 @@
+diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php
+index 24b2bee..1013892 100644
+--- a/core/templates/update.admin.php
++++ b/core/templates/update.admin.php
+@@ -37,7 +37,7 @@
+ 		<input class="updateButton" type="button" value="<?php p($l->t('Start update')) ?>">
+ 		<div class="infogroup">
+ 			<?php p($l->t('To avoid timeouts with larger installations, you can instead run the following command from your installation directory:')) ?>
+-			<pre>./occ upgrade</pre>
++			<pre>sudo -u apache php /usr/share/nextcloud/occ upgrade</pre>
+ 		</div>
+ 	</div>
+ 
+diff --git a/core/templates/update.use-cli.php b/core/templates/update.use-cli.php
+index 52d40cd..945d4d9 100644
+--- a/core/templates/update.use-cli.php
++++ b/core/templates/update.use-cli.php
+@@ -7,8 +7,10 @@
+ 			} else {
+ 				p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
+ 			} ?><br><br>
+-			<?php
+-			print_unescaped($l->t('For help, see the  <a target="_blank" rel="noreferrer" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br>
++      <code>
++sudo -u apache php /usr/share/nextcloud/occ upgrade
++</code>
++			<br><br>
+ 		</div>
+ 	</div>
+ </div>
-- 
cgit