Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <d@falconindy.com>2011-03-29 20:35:48 -0400
committerDan McGee <dan@archlinux.org>2011-03-30 20:43:11 -0500
commit541c2470b8ad8c1c0c925d2474da44384b5d7d66 (patch)
tree6e55dc07ca3b504553e263c4ed98d095df3a4f2f
parent287e8d356e8be8ae4af00e34e25d3f6727945952 (diff)
makepkg: avoid usage of tr to sidestep locale issues
to quote dan: "turkish will FUCK YOU UP. this is not the first or the last time" Signed-off-by: Dave Reisner <d@falconindy.com> Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in11
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index eb7c3701..dcc32343 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1039,13 +1039,12 @@ create_package() {
local comp_files=".PKGINFO"
# check for changelog/install files
- for i in 'changelog' 'install'; do
- orig=${!i}
- dest=$(tr '[:lower:]' '[:upper:]' <<<".$i")
+ for i in 'changelog/.CHANGELOG' 'install/.INSTALL'; do
+ IFS='/' read -r orig dest <<< "$i"
- if [[ -n $orig ]]; then
- msg2 "$(gettext "Adding %s file...")" "$i"
- cp "$startdir/$orig" "$dest"
+ if [[ -n ${!orig} ]]; then
+ msg2 "$(gettext "Adding %s file...")" "$orig"
+ cp "$startdir/${!orig}" "$dest"
chmod 644 "$dest"
comp_files+=" $dest"
fi