Mercurial > bins
annotate debian/patches/07_fix_share @ 6:3021deef1599
Encoding related fixes
* chomp encoding string
* reformat else (seems someone hacked it in)
* debug print encoding
* do not use :utf8 binmode ("re-encode") on written file if the input is _already_ UTF-8
author | Peter Gervai <grin@grin.hu> |
---|---|
date | Thu, 16 Oct 2008 00:02:14 +0200 |
parents | c5749e43b1d7 |
children |
rev | line source |
---|---|
4
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
1 #!/bin/sh -e |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
2 ## 07_fix_share.dpatch by Martin Michlmayr <tbm@cyrius.com> |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
3 ## |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
4 ## All lines beginning with `## DP:' are a description of the patch. |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
5 ## DP: use correct dir for share, Bug#327797 |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
6 |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
7 --- bins-1.1.29.orig/install.sh |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
8 +++ bins-1.1.29/install.sh |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
9 @@ -24,8 +24,9 @@ |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
10 GLOBAL_RC="$RC" |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
11 |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
12 DESTDIR=`echo "$DESTDIR"|sed 's%/$%%'` |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
13 -PREFIX=$DESTDIR/`echo "$PREFIX"|sed 's%^/%%'` |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
14 PREFIX=`echo "$PREFIX"|sed 's%/$%%'` |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
15 +GLOBAL_SHARE="$PREFIX/share" |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
16 +PREFIX=$DESTDIR/`echo "$PREFIX"|sed 's%^/%%'` |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
17 ETC=$DESTDIR/`echo "$ETC"|sed 's%^/%%'` |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
18 ETC=`echo "$ETC"|sed 's%/$%%'` |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
19 RC=$DESTDIR/`echo "$RC"|sed 's%^/%%'` |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
20 @@ -227,7 +228,7 @@ |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
21 do |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
22 echo -n " $FILE" |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
23 ed "$FILE" <<EoF 2>/dev/null |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
24 -1,\$s%/usr/local/share%$SHARE%g |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
25 +1,\$s%/usr/local/share%$GLOBAL_SHARE%g |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
26 1,\$s%/etc/bins%$GLOBAL_RC%g |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
27 wq |
c5749e43b1d7
Adding debian files (to original 1.1.29)
Peter Gervai <grin@grin.hu>
parents:
diff
changeset
|
28 EoF |