MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix PHP cannot take a shell script

Browse source 
Fix part of https://github.com/friendica/friendica/issues/4665
`php [shell file]` does not work, so use `php [php file]` instead.
`php bin/console.php` is more robust than e.g. `bin/console` which does
not work on Windows, or *nix systems without Bash
This commit is contained in:
Alexandre Alapetite 2018-03-24 12:47:40 +01:00
parent ed93fce743
commit e64196c7b3
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.translate.md
View file

@ -37,7 +37,7 @@ Assuming you want to convert the German localization which is placed in view/lan
2. Execute the po2php command, which will place the translation 2. Execute the po2php command, which will place the translation
in the strings.php file that is used by friendica. in the strings.php file that is used by friendica.
$> php bin/console po2php view/lang/de/messages.po $> php bin/console.php po2php view/lang/de/messages.po
The output of the script will be placed at view/lang/de/strings.php where The output of the script will be placed at view/lang/de/strings.php where
friendica is expecting it, so you can test your translation immediately. friendica is expecting it, so you can test your translation immediately.
@ -92,7 +92,7 @@ To update the translation files after you have translated strings of e.g. Espera
And then use the `po2php` command described above to convert the `messages.po` file to the `strings.php` file Friendica is loading. And then use the `po2php` command described above to convert the `messages.po` file to the `strings.php` file Friendica is loading.
$> php bin/console po2php view/lang/eo/messages.po $> php bin/console.php po2php view/lang/eo/messages.po
Afterwards, just commit the two changed files to a feature branch of your Friendica repository, push the changes to github and open a pull request for your changes. Afterwards, just commit the two changed files to a feature branch of your Friendica repository, push the changes to github and open a pull request for your changes.

2
doc/Developer-How-To-Move-Classes-to-src.md
View file

@ -94,7 +94,7 @@ Please remove all the `require_once` mentions of the former file, as they will p
## Miscellaneous tips ## Miscellaneous tips
When you are done with moving the class, please run `php bin/console typo` from the Friendica base directory to check for obvious mistakes. When you are done with moving the class, please run `php bin/console.php typo` from the Friendica base directory to check for obvious mistakes.
Howevever, this tool isn't bullet-proof, and a staging install of Friendica is recommended to test your class move without impairing your production server if you host one. Howevever, this tool isn't bullet-proof, and a staging install of Friendica is recommended to test your class move without impairing your production server if you host one.
Most of Friendica processes are run in the background, so make sure to turn on your debug log to check for errors that wouldn't show up while simply browsing Friendica. Most of Friendica processes are run in the background, so make sure to turn on your debug log to check for errors that wouldn't show up while simply browsing Friendica.

2
doc/Github.md
View file

@ -70,7 +70,7 @@ Don't hesitate to ask us in case of doubt.
3. Check your code for typos. 3. Check your code for typos.
There is a console command called *typo* for this. There is a console command called *typo* for this.
$> php bin/console typo $> php bin/console.php typo
Check out how to work with [our Vagrant](help/Vagrant) to save a lot of setup time! Check out how to work with [our Vagrant](help/Vagrant) to save a lot of setup time!

4
doc/translations.md
View file

@ -39,7 +39,7 @@ Assuming you want to convert the German localization which is placed in view/lan
2. Execute the po2php command, which will place the translation 2. Execute the po2php command, which will place the translation
in the strings.php file that is used by friendica. in the strings.php file that is used by friendica.
$> php bin/console po2php view/lang/de/messages.po $> php bin/console.php po2php view/lang/de/messages.po
The output of the script will be placed at view/lang/de/strings.php where The output of the script will be placed at view/lang/de/strings.php where
friendica is expecting it, so you can test your translation immediately. friendica is expecting it, so you can test your translation immediately.
@ -94,7 +94,7 @@ To update the translation files after you have translated strings of e.g. Espera
And then use the `po2php` command described above to convert the `messages.po` file to the `strings.php` file Friendica is loading. And then use the `po2php` command described above to convert the `messages.po` file to the `strings.php` file Friendica is loading.
$> php bin/console po2php view/lang/eo/messages.po $> php bin/console.php po2php view/lang/eo/messages.po
Afterwards, just commit the two changed files to a feature branch of your Friendica repository, push the changes to github and open a pull request for your changes. Afterwards, just commit the two changed files to a feature branch of your Friendica repository, push the changes to github and open a pull request for your changes.

4
mod/admin.php
View file

@ -718,7 +718,7 @@ function admin_page_summary(App $a)
$warningtext = []; $warningtext = [];
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$showwarning = true; $showwarning = true;
$warningtext[] = L10n::t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html'); $warningtext[] = L10n::t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
} }
// Check if github.com/friendica/master/VERSION is higher then // Check if github.com/friendica/master/VERSION is higher then
// the local version of Friendica. Check is opt-in, source may be master or devel branch // the local version of Friendica. Check is opt-in, source may be master or devel branch
@ -735,7 +735,7 @@ function admin_page_summary(App $a)
} }
if (Config::get('system', 'dbupdate') == DB_UPDATE_FAILED) { if (Config::get('system', 'dbupdate') == DB_UPDATE_FAILED) {
$showwarning = true; $showwarning = true;
$warningtext[] = L10n::t('The database update failed. Please run "php bin/console dbstructure update" from the command line and have a look at the errors that might appear.'); $warningtext[] = L10n::t('The database update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear.');
} }
$last_worker_call = Config::get('system', 'last_poller_execution', false); $last_worker_call = Config::get('system', 'last_poller_execution', false);

8
util/README
View file

@ -1,6 +1,6 @@
Utilities Utilities
php bin/console typo - is a crude syntax checker to avoid checking in files with simple php bin/console.php typo - is a crude syntax checker to avoid checking in files with simple
typos. It basically just loads each of our project files at once. Run from typos. It basically just loads each of our project files at once. Run from
cmdline and see if any parsing errors are reported. cmdline and see if any parsing errors are reported.
@ -8,7 +8,7 @@ cmdline and see if any parsing errors are reported.
Internationalisation Internationalisation
php bin/console extract - extracts translatable strings from our project files. It php bin/console.php extract - extracts translatable strings from our project files. It
currently doesn't pick up strings in other libraries we might be using such as currently doesn't pick up strings in other libraries we might be using such as
the HTML parsers. the HTML parsers.
@ -107,7 +107,7 @@ Xgettext and .po workflow
of the many .po editors out there, like QtLinguist of the many .po editors out there, like QtLinguist
5. run 5. run
$ php bin/console po2php view/lang/<language>/messages.po $ php bin/console.php po2php view/lang/<language>/messages.po
to create the strings.php file to create the strings.php file
When strings are added or modified in source, you could run When strings are added or modified in source, you could run
@ -117,4 +117,4 @@ When strings are added or modified in source, you could run
If you already translated Friendica using strings.php, you could import your old If you already translated Friendica using strings.php, you could import your old
translation to messages.po. Run: translation to messages.po. Run:
$ php bin/console php2po view/lang/<language>/strings.php $ php bin/console.php php2po view/lang/<language>/strings.php