Skip js deps installation if there's no jsdeps.json and install-jsdeps.sh

pull/5838/head
Aleksander Machniak 8 years ago
parent 9a6ab3dc86
commit 5597ff2107

@ -100,6 +100,7 @@ if (strtolower($input) == 'y') {
} }
// check if js-deps are up-to-date // check if js-deps are up-to-date
if (file_exists("$target_dir/jsdeps.json") && file_exists("$target_dir/bin/install-jsdeps.sh")) {
$jsdeps = json_decode(file_get_contents("$target_dir/jsdeps.json")); $jsdeps = json_decode(file_get_contents("$target_dir/jsdeps.json"));
$package = $jsdeps->dependencies[0]; $package = $jsdeps->dependencies[0];
$dest_file = $target_dir . '/' . $package->dest; $dest_file = $target_dir . '/' . $package->dest;
@ -108,6 +109,10 @@ if (strtolower($input) == 'y') {
system("cd $target_dir && bin/install-jsdeps.sh"); system("cd $target_dir && bin/install-jsdeps.sh");
echo "done.\n\n"; echo "done.\n\n";
} }
}
else {
echo "JavaScript dependencies installation skipped...\n";
}
echo "Running update script at target...\n"; echo "Running update script at target...\n";
system("cd $target_dir && php bin/update.sh --version=$oldversion"); system("cd $target_dir && php bin/update.sh --version=$oldversion");

Loading…
Cancel
Save