[arch-haskell] [PATCH 2/2] Quote PKGBUILD variables to prevent word expansion and consistency.
Xyne
xyne at archlinux.ca
Sun Sep 29 01:51:01 CEST 2013
---
src/Util/Translation.hs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Util/Translation.hs b/src/Util/Translation.hs
index b89a694..93d035f 100644
--- a/src/Util/Translation.hs
+++ b/src/Util/Translation.hs
@@ -181,7 +181,7 @@ instance Pretty ArchPkg where
text $ "patch -p4 < \"${srcdir}/source.patch\"")
buildPatchFile <$>
nest 4 (text "runhaskell Setup configure -O -p --enable-split-objs --enable-shared \\" <$>
- text "--prefix=/usr --docdir=/usr/share/doc/${pkgname} \\" <$>
+ text "--prefix=/usr --docdir=\"/usr/share/doc/${pkgname}\" \\" <$>
text "--libsubdir=\\$compiler/site-local/\\$pkgid" <> confFlags) <$>
text "runhaskell Setup build" <$>
text "runhaskell Setup haddock" <$>
@@ -199,7 +199,7 @@ instance Pretty ArchPkg where
maybe empty (\ _ ->
text $ "patch -p4 < \"${srcdir}/source.patch\"")
buildPatchFile <$>
- text "runhaskell Setup configure -O --prefix=/usr --docdir=/usr/share/doc/${pkgname}" <> confFlags <$>
+ text "runhaskell Setup configure -O --prefix=/usr --docdir=\"/usr/share/doc/${pkgname}\"" <> confFlags <$>
text "runhaskell Setup build"
) <$>
char '}'
@@ -215,9 +215,9 @@ instance Pretty ArchPkg where
text "install -D -m744 register.sh \"${pkgdir}/usr/share/haskell/${pkgname}/register.sh\"" <$>
text "install -m744 unregister.sh \"${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh\"" <$>
text "install -d -m755 \"${pkgdir}/usr/share/doc/ghc/html/libraries\"" <$>
- text "ln -s /usr/share/doc/${pkgname}/html \"${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}\"" <$>
+ text "ln -s \"/usr/share/doc/${pkgname}/html\" \"${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}\"" <$>
text "runhaskell Setup copy --destdir=\"${pkgdir}\"" <$>
- (maybe empty (\ _ -> text "install -D -m644 ${_licensefile} \"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE\"" <$>
+ (maybe empty (\ _ -> text "install -D -m644 \"${_licensefile}\" \"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE\"" <$>
text "rm -f \"${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}\"") licenseFile)
) <$>
char '}'
--
1.8.4
More information about the arch-haskell
mailing list