From 267a123cb50ce6d30bbbad68cd36a3f5cb6717ba Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Tue, 25 Oct 2011 12:18:50 +0200 Subject: [PATCH] fix missing } --- fonts/inconsolata/inconsolata.SlackBuild | 38 ++++++++++-------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/fonts/inconsolata/inconsolata.SlackBuild b/fonts/inconsolata/inconsolata.SlackBuild index 45285c75..2c842e3e 100755 --- a/fonts/inconsolata/inconsolata.SlackBuild +++ b/fonts/inconsolata/inconsolata.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh PRGNAM=$(basename $(pwd)) -VERSION=${VERSION:-$(date +%Y.%m.%d_%H.%M) +VERSION=${VERSION:-$(date +%Y.%m.%d_%H.%M)} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-cyco} @@ -15,29 +15,27 @@ OUTPUT=${OUTPUT:-/tmp} # Create working directories: mkdir -p $OUTPUT # place for the package to be saved +rm -fr $PKG mkdir -p $PKG # place for the package to be built -rm -rf $PKG/* # always erase old package's contents -rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log # remove old log files FONTDIR="/usr/share/fonts/OTF" # Move the fonts into place: mkdir -p $PKG$FONTDIR -( cd $PKG$FONTDIR/ - if [ -e $CWD/Inconsolata.otf ] ; then - cp $CWD/Inconsolata.otf . - else - wget -c http://www.levien.com/type/myfonts/Inconsolata.otf - fi - if [ -e $CWD/Inconsolata-dz.otf.zip ] ; then - unzip $CWD/Inconsolata-dz.otf.zip - else - wget -c http://media.nodnod.net/Inconsolata-dz.otf.zip ; - unzip Inconsolata-dz.otf.zip - rm Inconsolata-dz.otf.zip - fi -) +cd $PKG$FONTDIR/ +if [ -e $CWD/Inconsolata.otf ] ; then + cp $CWD/Inconsolata.otf . +else + wget -c http://www.levien.com/type/myfonts/Inconsolata.otf +fi +if [ -e $CWD/Inconsolata-dz.otf.zip ] ; then + unzip $CWD/Inconsolata-dz.otf.zip +else + wget -c http://media.nodnod.net/Inconsolata-dz.otf.zip ; + unzip Inconsolata-dz.otf.zip + rm Inconsolata-dz.otf.zip +fi # Post-install script: mkdir -p $PKG/install @@ -70,9 +68,5 @@ EOF # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz