diff --git a/CHANGELOG.md b/CHANGELOG.md index cc005aa..efabda5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ # Changelog All notable changes to this project will be documented in this file. Older changes are summarized on individual commits. +## [0.7.13.1] +- Thumb creation bugfix + ## [0.7.13.0] - Rewrites to diskutil code - Rewrites to mdutil code - Restructure paths -- Remove bundled Imagemagick - Fixed a sort order bug in rtc.php \ No newline at end of file diff --git a/Tester.zip b/Tester.zip index 2df1608..c52d89c 100644 Binary files a/Tester.zip and b/Tester.zip differ diff --git a/Tester/Tester.php b/Tester/Tester.php index 96804dc..0399bda 100644 --- a/Tester/Tester.php +++ b/Tester/Tester.php @@ -17,6 +17,7 @@ $bin_qltool = __DIR__."/bin/qltool"; $bin_sox = __DIR__."/bin/sox"; $bin_pngquant = __DIR__."/bin/pngquant"; $bin_parallel = __DIR__."/bin/parallel"; +$bin_convert = __DIR__."/bin/convert"; // System tools $bin_php = "php"; @@ -24,12 +25,10 @@ $bin_qlmanage = "qlmanage"; $bin_sips = "sips"; // External tools -$bin_convert = "/opt/local/bin/convert"; $bin_vips = "/opt/local/bin/vipsthumbnail"; ////////////////////////////////////////////////////////////////////// -if (empty(shell_exec("which ".$bin_convert))) { echo "Binary not found: ".$bin_convert."\n"; } if (empty(shell_exec("which ".$bin_vips))) { echo "Binary not found: ".$bin_vips."\n"; } if (empty($argv[2])) { echo "Nothing dragged"; die; } diff --git a/Yuba.app.zip b/Yuba.app.zip index 7b9e90c..f9188c6 100644 Binary files a/Yuba.app.zip and b/Yuba.app.zip differ diff --git a/Yuba.php b/Yuba.php index ddc00c8..f01d28f 100755 --- a/Yuba.php +++ b/Yuba.php @@ -68,7 +68,7 @@ if (!is_dir($tmpdir)) { mkdir($tmpdir,0777,true); } $stamp = date("Y-m-d_H-i-s", $mytime); -if (!isset($argv[1])) { echo "No input"; die; } +if (!isset($argv[1]) || $argv[1] == "") { echo "No input"; die; } $zpath = realpath(@$argv[1]); if ($p['bdest']) { $bdest = realpath($p['bdest']); } else { $bdest = "/Users/".get_current_user()."/Documents/Yuba/"; } if (!is_dir($bdest)) { if (!mkdir($bdest)) { echo "Error creating directory: ".$bdest; die; } } @@ -569,10 +569,10 @@ if ($p['thumbs']) { $pathname = $array[1]; $tcmd = $bin_php." ".$helper." thumbs ".$fid." ".escapeshellarg($pathname)." ".escapeshellarg($bpath)." ".$mytime."; echo ".ProgressBar::next(); msg($tcmd); - $line[] = $tcmd; + $tline[] = $tcmd; } - file_put_contents($batchfile,implode("\n", $line)); + file_put_contents($batchfile,implode("\n", $tline)); echo ProgressBar::finish($wopt_clear); echo ProgressBar::start($passed_file,"Running thumb batch (".stepString().")"); @@ -600,10 +600,10 @@ if ($p['icons']) { $pathname = $array[1]; $icmd = $bin_php." ".$helper." icons ".$fid." ".escapeshellarg($pathname)." ".escapeshellarg($bpath)." ".$mytime."; echo ".ProgressBar::next(); msg($icmd); - $line[] = $icmd; + $iline[] = $icmd; } - file_put_contents($batchfile,implode("\n", $line)); + file_put_contents($batchfile,implode("\n", $iline)); echo ProgressBar::finish($wopt_clear); echo ProgressBar::start($passed_file,"Running icon batch (".stepString().")"); diff --git a/Yuba.platypus b/Yuba.platypus index 80bcc78..7a650d5 100644 --- a/Yuba.platypus +++ b/Yuba.platypus @@ -37,7 +37,7 @@ InterfaceType Progress Bar InterpreterPath - /usr/bin/php + /bin/bash Name Yuba NibPath diff --git a/current_version.txt b/current_version.txt index 45c8651..7f92c14 100755 --- a/current_version.txt +++ b/current_version.txt @@ -1 +1 @@ -0.7.13.0 \ No newline at end of file +0.7.13.1 \ No newline at end of file diff --git a/filetypes.php b/filetypes.php index c10b8b9..102a79a 100755 --- a/filetypes.php +++ b/filetypes.php @@ -13,6 +13,7 @@ $bin_qltool = __DIR__."/bin/qltool"; $bin_sox = __DIR__."/bin/sox"; $bin_pngcrush = __DIR__."/bin/pngcrush"; $bin_parallel = __DIR__."/bin/parallel"; +$bin_convert = __DIR__."/bin/convert"; // System tools $bin_php = "php"; @@ -20,7 +21,6 @@ $bin_qlmanage = "qlmanage"; $bin_sips = "sips"; // External tools -$bin_convert = "/opt/local/bin/convert"; $bin_vips = "/opt/local/bin/vipsthumbnail"; // Treat these directories as files diff --git a/script b/script index 75f9fbe..1b944ae 100755 --- a/script +++ b/script @@ -1,5 +1,3 @@ - \ No newline at end of file +/usr/bin/php Yuba.php "$1" \ No newline at end of file