Commit a01aa062 authored by Tristan Cavelier's avatar Tristan Cavelier

XXX rewrite scripts: move /usr/bin to last place

parent 53628c3e
......@@ -14,7 +14,7 @@ url = https://github.com/ONLYOFFICE/core/archive/f84ee9a5a30b79a2995a96f8019978d
md5sum = 2ead88646094941dc8de12cdc72ba3b2
patch-options = -p0
patches =
${:_profile_base_location_}/rewrite-scripts.patch#774f855a146132f8cfb789892e4d7f21
${:_profile_base_location_}/rewrite-scripts.patch#4abbc42379fb551e6a75dfce484e7204
${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de
# ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7
# error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/
......
......@@ -304,11 +304,13 @@
+ cp "./third_party/icu/mac/icudtl_dat.S" "./../$platform$arch/"
fi
--- Common/3dParty/v8/fetch.sh.orig 2017-01-30 15:01:43.810152465 +0100
+++ Common/3dParty/v8/fetch.sh 2017-01-30 15:01:29.438152175 +0100
@@ -1,20 +1,20 @@
+++ Common/3dParty/v8/fetch.sh 2017-02-01 15:24:37.740189528 +0100
@@ -1,20 +1,22 @@
#!/bin/bash
+# XXX actualy, this file should be named fetch.bash
+set -e
+# XXX move /usr/bin to last PATH place
+_tmp_PATH=$(echo "$PATH" | sed 's,\(^\|:\)/usr/bin\(:\|$\),\1\2,g') && export PATH="$(echo "$_tmp_PATH:/usr/bin" | sed 's,:\+,:,g')" || :
SCRIPT=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment