File tree Expand file tree Collapse file tree 11 files changed +17
-16
lines changed Expand file tree Collapse file tree 11 files changed +17
-16
lines changed Original file line number Diff line number Diff line change @@ -119,6 +119,7 @@ users)
119119 * Add a test for shared fetch without checksum, and for VCS shared fetch (not handled) [ #6627 @rjbou ]
120120 * Add a test showing the error message when faced with an UTF-8 character in the package version [ #6640 @kit-ty-kate ]
121121 * Remove ` getconf ` filtering [ #6671 @rjbou ]
122+ * Update/homogenise escaping ` BASEDIR ` using ` printf ` [ #6671 @rjbou ]
122123
123124### Engine
124125 * Fix gcc < 14.3 bug on mingw i686 [ #6624 @kit-ty-kate ]
Original file line number Diff line number Diff line change @@ -165,7 +165,7 @@ Clearing cache of downloaded files
165165opam-version: "2.0"
166166### <mkurl.sh>
167167file="REPO/packages/foo/foo.1/opam"
168- basedir=`echo "$BASEDIR" | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
168+ basedir=$(printf '%s' "$BASEDIR" | sed ' s/\\/\\\\/g')
169169url="$basedir/arch.tgz"
170170echo "url {" >> "$file"
171171echo "src:\"$url\"" >> "$file"
@@ -213,7 +213,7 @@ content
213213opam-version: "2.0"
214214### <mkurl.sh>
215215file="REPO/packages/bar/bar.1/opam"
216- basedir=`echo "$BASEDIR" | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
216+ basedir=$(printf '%s' "$BASEDIR" | sed ' s/\\/\\\\/g')
217217echo "url {" >> "$file"
218218echo "src:\"git+file://$basedir/bar\"" >> "$file"
219219echo "}" >> "$file"
Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ install: [
3636p=foo-arch.1
3737arch=arch
3838file="REPO/packages/${p%.*}/$p/opam"
39- basedir=`echo "$BASEDIR" | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
39+ basedir=$(printf '%s' "$BASEDIR" | sed ' s/\\/\\\\/g')
4040MD5=$(openssl md5 "$arch.tgz" | cut -d' ' -f2)
4141cat << EOF >> "$file"
4242url {
Original file line number Diff line number Diff line change @@ -903,7 +903,7 @@ license: "ISC"
903903dev-repo: "hg+https://
[email protected] "
904904bug-reports: "https://nobug"
905905### <add-url.sh>
906- basedir=`echo "$BASEDIR" | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
906+ basedir=$(printf '%s' "$BASEDIR" | sed ' s/\\/\\\\/g')
907907cat << EOF >> lint.opam
908908url { src:"file://$basedir/an-archive" }
909909EOF
@@ -924,7 +924,7 @@ license: "ISC"
924924dev-repo: "hg+https://
[email protected] "
925925bug-reports: "https://nobug"
926926### <add-url.sh>
927- basedir=`echo "$BASEDIR" | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
927+ basedir=$(printf '%s' "$BASEDIR" | sed ' s/\\/\\\\/g')
928928cat << EOF >> lint.opam
929929url {
930930 src:"file://$basedir/an-archive.tgz"
Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ opam-version: "2.0"
8989depends: "qux"
9090depexts: [ "inexistant" ]
9191### <add_pin_depends.sh>
92- basedir=`echo $BASEDIR | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
92+ basedir=$(printf '%s' " $BASEDIR" | sed ' s/\\/\\\\/g')
9393echo "pin-depends: [ \"qux.dev\" \"file://$basedir/qux\" ]" >> bar/bar.opam
9494### sh add_pin_depends.sh
9595### <pin:qux/qux.opam>
Original file line number Diff line number Diff line change 6161 tar czf "$nv.tgz" "$nv.t"
6262 MD5=$(openssl md5 "$nv.tgz" | cut -d' ' -f2)
6363 XMD5=$(openssl md5 "$pre/files/$n.install" | cut -d' ' -f2)
64- basedir=`echo "$BASEDIR" | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\/g"`
64+ basedir=$(printf '%s' "$BASEDIR" | sed ' s/\\/\\\\/g')
6565 cat << EOF > "$pre/opam"
6666opam-version:"2.0"
6767build: [ "test" "-f" "%{name}%.%{version}%.t" ]
@@ -1351,7 +1351,7 @@ src: "file://${BASEDIR}/over-epr"
13511351### <pin-depends.sh>
13521352#!/bin/sh
13531353set -eu
1354- basedir=$(echo "$BASEDIR" | sed 's/\\/\\\\ \\\\/g')
1354+ basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
13551355cat << EOF >> "$1"
13561356pin-depends: [
13571357 ["$2" "file://$basedir/$3"]
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ opam-version: "2.0"
1010build: [ "test" "-f" "something" ]
1111### <mkurl.sh>
1212file="REPO/packages/a/a.1/opam"
13- basedir=`echo $BASEDIR | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
13+ basedir=$(printf '%s' " $BASEDIR" | sed ' s/\\/\\\\/g')
1414url="$basedir/$1.tgz"
1515echo "url {" >> $file
1616echo "src:\"$url\"" >> $file
@@ -55,7 +55,7 @@ opam-version: "2.0"
5555install: [ "test" "-f" "i-am-extra-source" ]
5656### <mkxsrc.sh>
5757file="REPO/packages/b/b.1/opam"
58- basedir=`echo $BASEDIR | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
58+ basedir=$(printf '%s' " $BASEDIR" | sed ' s/\\/\\\\/g')
5959xsrc="$basedir/other-sources/$1"
6060echo "extra-source \"i-am-extra-source\" {" >> $file
6161echo "src: \"$xsrc\"" >> $file
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ echo "src: \"$arch.tgz\"" >> $file
1919MD5=$(openssl md5 $arch.tgz | cut -d' ' -f2)
2020echo "checksum: \"md5=$MD5\"" >> $file
2121echo "}" >> $file
22- basedir=`echo $BASEDIR | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
22+ basedir=$(printf '%s' " $BASEDIR" | sed ' s/\\/\\\\/g')
2323echo "dev-repo: \"git+file://${basedir}/pandev\"" >> $file
2424### sh mkurl.sh
2525### opam update
@@ -118,7 +118,7 @@ opam-version: "2.0"
118118### <mkurl.sh>
119119p=pandore.4
120120file="REPO/packages/${p%.*}/$p/opam"
121- basedir=`echo $BASEDIR | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
121+ basedir=$(printf '%s' " $BASEDIR" | sed ' s/\\/\\\\/g')
122122echo "url {" >> $file
123123echo "git: \"$basedir/pandev\"" >> $file
124124echo "}" >> $file
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ echo "src: \"$arch\"" >> "$file"
1818MD5=$(openssl md5 "$arch" | cut -d' ' -f2)
1919echo "checksum: \"md5=$MD5\"" >> "$file"
2020echo "}" >> "$file"
21- basedir=`echo "$BASEDIR" | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
21+ basedir=$(printf '%s' "$BASEDIR" | sed ' s/\\/\\\\/g')
2222echo "dev-repo: \"file://${basedir}/$n\"" >> "$file"
2323### sh mkurl.sh
2424### <pkg:waste-local.1>
@@ -27,7 +27,7 @@ opam-version: "2.0"
2727n=waste-local
2828v=1
2929file="REPO/packages/$n/$n.$v/opam"
30- basedir=`echo "$BASEDIR" | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
30+ basedir=$(printf '%s' "$BASEDIR" | sed ' s/\\/\\\\/g')
3131echo "url { local: \"file://${basedir}/waste\" }" >> "$file"
3232### sh mkurl.sh
3333### opam update
Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ install: ["cp" "snd.out" "%{lib}%"]
8080dev-repo: "hg+https://
[email protected] "
8181url {
8282### <add-hash.sh>
83- basedir=`echo $BASEDIR | sed " s/\\\\\\\\ /\\\\\\\\\\\\\\\\/g"`
83+ basedir=$(printf '%s' " $BASEDIR" | sed ' s/\\/\\\\/g')
8484echo "src: \"git+file://${basedir}/nip#snd-head\"}}" >> twice.snd.xp
8585### sh add-hash.sh
8686### opam switch import twice.snd.xp
You can’t perform that action at this time.
0 commit comments