diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/installto.sh | 2 | ||||
| -rwxr-xr-x | bin/makedoc.sh | 10 | ||||
| -rwxr-xr-x | bin/msgexport.sh | 2 | ||||
| -rwxr-xr-x | bin/transifexpull.sh | 6 | ||||
| -rwxr-xr-x | bin/update.sh | 6 |
5 files changed, 15 insertions, 11 deletions
diff --git a/bin/installto.sh b/bin/installto.sh index 269a5dc06..fbd951bdf 100755 --- a/bin/installto.sh +++ b/bin/installto.sh @@ -71,7 +71,7 @@ if (strtolower($input) == 'y') { if (!$err) { echo "Running update script at target...\n"; - system("cd $target_dir && bin/update.sh --version=$oldversion"); + system("cd $target_dir && php bin/update.sh --version=$oldversion"); echo "All done.\n"; } } diff --git a/bin/makedoc.sh b/bin/makedoc.sh index 2a34254cb..3602c3a65 100755 --- a/bin/makedoc.sh +++ b/bin/makedoc.sh @@ -1,7 +1,7 @@ #!/bin/sh TITLE="Roundcube Webmail" -PACKAGES="Core" +PACKAGES="Webmail" INSTALL_PATH="`dirname $0`/.." PATH_PROJECT=$INSTALL_PATH/program/include @@ -16,11 +16,9 @@ then fi OUTPUTFORMAT=HTML -CONVERTER=frames -TEMPLATE=earthli -PRIVATE=off +TEMPLATE=responsive-twig # make documentation -$BIN_PHPDOC -d $PATH_PROJECT,$PATH_FRAMEWORK -t $PATH_DOCS -ti "$TITLE" -dn $PACKAGES \ --o $OUTPUTFORMAT:$CONVERTER:$TEMPLATE -pp $PRIVATE +$BIN_PHPDOC -d $PATH_PROJECT,$PATH_FRAMEWORK -t $PATH_DOCS --title "$TITLE" --defaultpackagename $PACKAGES \ + --template=$TEMPLATE diff --git a/bin/msgexport.sh b/bin/msgexport.sh index e98e5fee2..f68688b67 100755 --- a/bin/msgexport.sh +++ b/bin/msgexport.sh @@ -58,7 +58,7 @@ function export_mailbox($mbox, $filename) $from = current(rcube_mime::decode_address_list($headers->from, 1, false)); fwrite($out, sprintf("From %s %s UID %d\n", $from['mailto'], $headers->date, $headers->uid)); - fwrite($out, $IMAP->print_raw_body($headers->uid)); + $IMAP->get_raw_body($headers->uid, $out); fwrite($out, "\n\n\n"); progress_update($i+1, $count); diff --git a/bin/transifexpull.sh b/bin/transifexpull.sh index ba26a07f1..7415c02fd 100755 --- a/bin/transifexpull.sh +++ b/bin/transifexpull.sh @@ -36,3 +36,9 @@ done for file in $PWD/../plugins/*/localization/*.inc; do do_clean $file done + +# remove empty localization files +for file in $PWD/../program/localization/*/labels.inc; do grep -q -E '\$labels' $file || rm $file; done +for file in $PWD/../program/localization/*/messages.inc; do grep -q -E '\$messages' $file || rm $file; done +for file in $PWD/../plugins/*/localization/*.inc; do grep -q -E '\$(labels|messages)' $file || rm $file; done + diff --git a/bin/update.sh b/bin/update.sh index 8bfb9d603..d35e1eb0d 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -147,7 +147,7 @@ if ($RCI->configured) { // check file type detection if ($RCI->check_mime_detection()) { echo "WARNING: File type detection doesn't work properly!\n"; - echo "Please check the 'mime_magic' config option or the finfo functions of PHP andrun this script again.\n"; + echo "Please check the 'mime_magic' config option or the finfo functions of PHP and run this script again.\n"; } if ($RCI->check_mime_extensions()) { echo "WARNING: Mimetype to file extension mapping doesn't work properly!\n"; @@ -157,7 +157,7 @@ if ($RCI->configured) { // check database schema if ($RCI->config['db_dsnw']) { echo "Executing database schema update.\n"; - system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $opts['version'] + system("php " . INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $opts['version'] . " --dir=" . INSTALL_PATH . DIRECTORY_SEPARATOR . "SQL", $res); $success = !$res; @@ -165,7 +165,7 @@ if ($RCI->configured) { // index contacts for fulltext searching if ($opts['version'] && version_compare(version_parse($opts['version']), '0.6.0', '<')) { - system(INSTALL_PATH . 'bin/indexcontacts.sh'); + system("php " . INSTALL_PATH . 'bin/indexcontacts.sh'); } if ($success) { |