network/dnscrypt-proxy: Align to template.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

1 files changed, 34 insertions, 33 deletions

diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
index 95cf313603ad2..4b59f7799eafc 100644
--- a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
+++ b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
@@ -25,8 +25,6 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-set -e
-
 PRGNAM=dnscrypt-proxy
 VERSION=${VERSION:-2.1.5}
 BUILD=${BUILD:-1}
@@ -39,77 +37,80 @@ DNSCRYPT_GROUP=${DNSCRYPT_GROUP:-dnscrypt}
 DNSCRYPT_GID=${DNSCRYPT_GID:-293}
 
 if [ -z "$ARCH" ]; then
-    case "$( uname -m )" in
+  case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
-    esac
+  esac
 fi
 
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-    echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-    exit 0
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
+
 bailout() {
-    echo -e "\nYou must have a $DNSCRYPT_USER user and $DNSCRYPT_GROUP group to run this script. "
-    echo -e    "Something like this should suffice for most systems: "
-    echo -e    "# groupadd -g $DNSCRYPT_GID $DNSCRYPT_GROUP "
-    echo -e    "# useradd -u $DNSCRYPT_UID -g $DNSCRYPT_GID -c \"DNSCrypt-proxy\" -d /dev/null -s /bin/false $DNSCRYPT_USER \n"
-    exit 1
+  echo -e "\nYou must have a $DNSCRYPT_USER user and $DNSCRYPT_GROUP group to run this script. "
+  echo -e    "Something like this should suffice for most systems: "
+  echo -e    "# groupadd -g $DNSCRYPT_GID $DNSCRYPT_GROUP "
+  echo -e    "# useradd -u $DNSCRYPT_UID -g $DNSCRYPT_GID -c \"DNSCrypt-proxy\" -d /dev/null -s /bin/false $DNSCRYPT_USER \n"
+  exit 1
 }
 
-if ! grep -q "^$DNSCRYPT_USER:" /etc/passwd; then
-    bailout
-elif ! grep -q "^$DNSCRYPT_GROUP:" /etc/group; then
-    bailout
+if ! grep -q "^$DNSCRYPT_USER:" /etc/passwd > /dev/null 2>&1 ; then
+  bailout
+elif ! grep -q "^$DNSCRYPT_GROUP:" /etc/group > /dev/null 2>&1 ; then
+  bailout
 fi
 
 rm -rf $PKG
-mkdir -p $TMP/$PRGNAM-$VERSION $PKG $OUTPUT
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-
 if [[ $ARCH == i?86 ]]; then
-    tar xvf $CWD/$PRGNAM-linux_i386-$VERSION.tar.gz --transform="s/linux-i386/$PRGNAM-$VERSION/"
+  tar xvf $CWD/$PRGNAM-linux_i386-$VERSION.tar.gz --transform="s/linux-i386/$PRGNAM-$VERSION/"
 elif [[ $ARCH == x86_64 ]]; then
-    tar xvf $CWD/$PRGNAM-linux_x86_64-$VERSION.tar.gz --transform="s/linux-x86_64/$PRGNAM-$VERSION/"
+  tar xvf $CWD/$PRGNAM-linux_x86_64-$VERSION.tar.gz --transform="s/linux-x86_64/$PRGNAM-$VERSION/"
 else
-    echo "Architecture not supported"
-    exit 1
+  echo "Architecture not supported"
+  exit 1
 fi
-
 cd $PRGNAM-$VERSION
 chown -R root:root .
-
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/{bin,doc/$PRGNAM-$VERSION} \
+mkdir -p $PKG/usr/bin \
     $PKG/etc/{$PRGNAM,rc.d} \
-    $PKG/var/{log,run}/$PRGNAM \
-    $PKG/install
+    $PKG/var/{log,run}/$PRGNAM
 
-cp -a *.txt $PKG/etc/$PRGNAM/
-install -D -m 0644 LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cp -a ./*.txt $PKG/etc/$PRGNAM/
 install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
 install -D -m 0644 $CWD/$PRGNAM.toml $PKG/etc/$PRGNAM/$PRGNAM.toml
-install -D -m 0644 $CWD/README.Slackware $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
-install -D -m 0644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 install -D -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM
 
-sed -i "s/DNSCRYPT_UID=.*$/DNSCRYPT_UID=$DNSCRYPT_UID/" $CWD/doinst.sh
-sed -i "s/DNSCRYPT_GID=.*$/DNSCRYPT_GID=$DNSCRYPT_GID/" $CWD/doinst.sh
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README.Slackware > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+sed -i "s/DNSCRYPT_UID=.*$/DNSCRYPT_UID=$DNSCRYPT_UID/" $PKG/install/doinst.sh
+sed -i "s/DNSCRYPT_GID=.*$/DNSCRYPT_GID=$DNSCRYPT_GID/" $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE