Fix so install-jsdeps.sh removes Bootstrap's sourceMappingURL (#7035)

pull/7066/head
Aleksander Machniak 5 years ago
parent 2f928a516d
commit 04aff2efa3

@ -13,6 +13,7 @@ CHANGELOG Roundcube Webmail
- Fix bug where a new saved search added after removing all searches wasn't added to the list (#7061) - Fix bug where a new saved search added after removing all searches wasn't added to the list (#7061)
- Fix bug where a new contact group added after removing all groups from addressbook wasn't added to the list - Fix bug where a new contact group added after removing all groups from addressbook wasn't added to the list
- Fix bug where Ctype extension wasn't required in Installer and INSTALL file (#7049) - Fix bug where Ctype extension wasn't required in Installer and INSTALL file (#7049)
- Fix so install-jsdeps.sh removes Bootstrap's sourceMappingURL (#7035)
RELEASE 1.4.1 RELEASE 1.4.1
------------- -------------

@ -237,7 +237,7 @@ function extract_zipfile($package, $srcfile)
echo "Extracting files $pattern into $destdir\n"; echo "Extracting files $pattern into $destdir\n";
exec(sprintf('%s -o %s %s -d %s', $UNZIP, escapeshellarg($srcfile), escapeshellarg($pattern), $destdir), $out, $retval); exec(sprintf('%s -o %s %s -d %s', $UNZIP, escapeshellarg($srcfile), escapeshellarg($pattern), $destdir), $out, $retval);
if ($retval !== 0) { if ($retval !== 0) {
rcube::raise_error("Failed to unpack $pattern; " . join('; ' . $out)); rcube::raise_error("Failed to unpack $pattern; " . implode('; ' . $out));
} }
} }
} }
@ -258,22 +258,35 @@ function extract_zipfile($package, $srcfile)
foreach ($package['map'] as $src => $dest) { foreach ($package['map'] as $src => $dest) {
echo "Installing $sourcedir/$src into $destdir/$dest\n"; echo "Installing $sourcedir/$src into $destdir/$dest\n";
$dest_file = $destdir . '/' . $dest;
$src_file = $sourcedir . '/' . $src;
// make sure the destination's parent directory exists // make sure the destination's parent directory exists
if (strpos($dest, '/') !== false) { if (strpos($dest, '/') !== false) {
$parentdir = dirname($destdir . '/' . $dest); $parentdir = dirname($dest_file);
if (!is_dir($parentdir)) { if (!is_dir($parentdir)) {
mkdir($parentdir, 0775, true); mkdir($parentdir, 0775, true);
} }
} }
// avoid copying source directory as a child into destination // avoid copying source directory as a child into destination
if (is_dir($sourcedir . '/' . $src) && is_dir($destdir . '/' . $dest)) { if (is_dir($src_file) && is_dir($dest_file)) {
exec(sprintf('rm -rf %s/%s', $destdir, $dest)); exec(sprintf('rm -rf %s', $dest_file));
} }
exec(sprintf('mv -f %s/%s %s/%s', $sourcedir, $src, $destdir, $dest), $out, $retval); exec(sprintf('mv -f %s %s', $src_file, $dest_file), $out, $retval);
if ($retval !== 0) { if ($retval !== 0) {
rcube::raise_error("Failed to move $src into $destdir/$dest; " . join('; ' . $out)); rcube::raise_error("Failed to move $src into $dest_file; " . implode('; ' . $out));
}
// Remove sourceMappingURL
else if (isset($package['sourcemap']) && $package['sourcemap'] === false) {
if ($content = file($dest_file)) {
$index = count($content);
if (preg_match('|sourceMappingURL=|', $content[$index-1])) {
array_pop($content);
file_put_contents($dest_file, implode('', $content));
}
}
} }
} }
@ -285,7 +298,7 @@ function extract_zipfile($package, $srcfile)
echo "Extracting zip archive into $destdir\n"; echo "Extracting zip archive into $destdir\n";
exec(sprintf('%s -o %s -d %s', $UNZIP, escapeshellarg($srcfile), $destdir), $out, $retval); exec(sprintf('%s -o %s -d %s', $UNZIP, escapeshellarg($srcfile), $destdir), $out, $retval);
if ($retval !== 0) { if ($retval !== 0) {
rcube::raise_error("Failed to unzip $srcfile; " . join('; ' . $out)); rcube::raise_error("Failed to unzip $srcfile; " . implode('; ' . $out));
} }
} }

@ -94,6 +94,7 @@
"sha1": "ee9e9d6bbbb6181dc519778af2b38804a6aa62a4", "sha1": "ee9e9d6bbbb6181dc519778af2b38804a6aa62a4",
"license": "MIT", "license": "MIT",
"flat": true, "flat": true,
"sourcemap": false,
"map": { "map": {
"bootstrap.bundle.min.js": "bootstrap.bundle.min.js", "bootstrap.bundle.min.js": "bootstrap.bundle.min.js",
"bootstrap.min.css": "bootstrap.min.css" "bootstrap.min.css": "bootstrap.min.css"

Loading…
Cancel
Save