Title: [292769] trunk/Tools
- Revision
- 292769
- Author
- clo...@igalia.com
- Date
- 2022-04-12 07:06:35 -0700 (Tue, 12 Apr 2022)
Log Message
[GTK][WPE] generate-bundle: fix typo/bug in the wrapper shell code for the bundle after r292109.
https://bugs.webkit.org/show_bug.cgi?id=237107
There was a typo/bug in the shell code for the bundle that tried to check
if a path was absolute. Fix the issue and also improve the code a bit.
Unreviewed follow-up fix.
* Scripts/webkitpy/binary_bundling/bundle.py:
(BinaryBundler.generate_wrapper_script):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (292768 => 292769)
--- trunk/Tools/ChangeLog 2022-04-12 09:43:52 UTC (rev 292768)
+++ trunk/Tools/ChangeLog 2022-04-12 14:06:35 UTC (rev 292769)
@@ -1,3 +1,16 @@
+2022-04-12 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [GTK][WPE] generate-bundle: fix typo/bug in the wrapper shell code for the bundle after r292109.
+ https://bugs.webkit.org/show_bug.cgi?id=237107
+
+ There was a typo/bug in the shell code for the bundle that tried to check
+ if a path was absolute. Fix the issue and also improve the code a bit.
+
+ Unreviewed follow-up fix.
+
+ * Scripts/webkitpy/binary_bundling/bundle.py:
+ (BinaryBundler.generate_wrapper_script):
+
2022-04-11 Tyler Wilcock <tyle...@apple.com>
AX: Update isolated tree in response to AXReadOnlyStatusChanged, AXRequiredStatusChanged, and AXPressedStateChanged notifications
Modified: trunk/Tools/Scripts/webkitpy/binary_bundling/bundle.py (292768 => 292769)
--- trunk/Tools/Scripts/webkitpy/binary_bundling/bundle.py 2022-04-12 09:43:52 UTC (rev 292768)
+++ trunk/Tools/Scripts/webkitpy/binary_bundling/bundle.py 2022-04-12 14:06:35 UTC (rev 292769)
@@ -164,12 +164,12 @@
script_handle.write('# Shipped binaries have a relpath to the interpreter, so update passed args with fullpaths and cd to ${MYDIR}\n')
script_handle.write('args_update_relpaths_to_abs() {\n')
script_handle.write(' for arg in "$@"; do\n')
- script_handle.write(' [ -e "${arg}" -a "${arg}" != "${a#/}" ] && arg="$(readlink -f "${arg}")"\n')
+ script_handle.write(' [ "${arg}" = "${arg#/}" ] && [ -e "${arg}" ] && arg="$(readlink -f -- "${arg}")"\n')
script_handle.write(' printf %s "${arg}" | sed "s/\'/\'\\\\\\\\\'\'/g;1s/^/\'/;\\$s/\\$/\' /"\n')
script_handle.write(' done\n')
script_handle.write('echo " "\n')
script_handle.write('}\n')
- script_handle.write('eval "set -- "$(args_update_relpaths_to_abs "$@")""\n')
+ script_handle.write('eval "set -- $(args_update_relpaths_to_abs "$@")"\n')
script_handle.write('cd "${MYDIR}"\n')
if os.path.isfile(os.path.join(share_dir, 'certs/bundle-ca-certificates.pem')):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
