diff options
author | Thomas Bruederli <thomas@roundcube.net> | 2017-06-16 10:46:47 +0300 |
---|---|---|
committer | Thomas Bruederli <thomas@roundcube.net> | 2017-06-16 10:46:47 +0300 |
commit | 03cea6c6c9409b0feaa15d1442778883135070cb (patch) | |
tree | 35a4a39bc53ac5b26baabde0d3b93279b00b17e7 /bin | |
parent | e1d57aadfae6e20165c564531eafa63dc2cc8f37 (diff) |
Fix js-deps check and installation
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/install-jsdeps.sh | 2 | ||||
-rwxr-xr-x | bin/installto.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/install-jsdeps.sh b/bin/install-jsdeps.sh index 9a33c06a6..e5c68ca9d 100755 --- a/bin/install-jsdeps.sh +++ b/bin/install-jsdeps.sh @@ -50,7 +50,7 @@ if (empty($CURL) && empty($WGET)) { $CACHEDIR = sys_get_temp_dir(); -if (is_writeable(INSTALL_PATH . 'temp/js_cache') || mkdir(INSTALL_PATH . 'temp/js_cache', 0774, true)) { +if (is_writeable(INSTALL_PATH . 'temp/js_cache') || @mkdir(INSTALL_PATH . 'temp/js_cache', 0774, true)) { $CACHEDIR = INSTALL_PATH . 'temp/js_cache'; } diff --git a/bin/installto.sh b/bin/installto.sh index 568de70a2..42cfecae3 100755 --- a/bin/installto.sh +++ b/bin/installto.sh @@ -102,8 +102,8 @@ if (strtolower($input) == 'y') { // check if js-deps are up-to-date $jsdeps = json_decode(file_get_contents("$target_dir/jsdeps.json")); $package = $jsdeps->dependencies[0]; - $dest_file = $target_dir . '/' . $package['dest']; - if (!file_exists($dest_file) || sha1_file($dest_file) !== $package['sha1']) { + $dest_file = $target_dir . '/' . $package->dest; + if (!file_exists($dest_file) || sha1_file($dest_file) !== $package->sha1) { echo "Installing JavaScript dependencies..."; system("cd $target_dir && bin/install-jsdeps.sh"); echo "done.\n\n"; |