[0.1.3-1] Support any name of <config.h>

3 files changed, 29 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2de7fa989771..f9d6599a8363 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = an9wer-suckless-rebuild
 	pkgdesc = A script to rebuild suckless softwares
-	pkgver = 0.1.2
+	pkgver = 0.1.3
 	pkgrel = 1
 	url = https://github.com/an9wer/pkg/tree/master/arch/suckless-rebuild
 	arch = x86_64
@@ -8,7 +8,7 @@ pkgbase = an9wer-suckless-rebuild
 	license = MIT
 	depends = bash
 	source = suckless-rebuild
-	md5sums = c7d19bc4fdd6376df88fda66a2ff26a8
+	md5sums = ef5d643d2cbd06b9f3199dc4c1a98377
 
 pkgname = an9wer-suckless-rebuild
 
diff --git a/PKGBUILD b/PKGBUILD
index eba3060378fc..a904b3fa8f12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Runney Wu <an9wer@gmail.com>
 
 pkgname=an9wer-suckless-rebuild
-pkgver=0.1.2
+pkgver=0.1.3
 pkgrel=1
 pkgdesc="A script to rebuild suckless softwares"
 url="https://github.com/an9wer/pkg/tree/master/arch/suckless-rebuild"
@@ -10,7 +10,7 @@ license=('MIT')
 groups=('an9wer-suckless')
 depends=('bash')
 source=("suckless-rebuild")
-md5sums=('c7d19bc4fdd6376df88fda66a2ff26a8')
+md5sums=('ef5d643d2cbd06b9f3199dc4c1a98377')
 
 package() {
   install -m755 -D suckless-rebuild "$pkgdir/usr/bin/suckless-rebuild"
diff --git a/suckless-rebuild b/suckless-rebuild
index cafd90755049..32cc73dc4f8f 100755
--- a/suckless-rebuild
+++ b/suckless-rebuild
@@ -1,31 +1,42 @@
 #!/usr/bin/env bash
 
+VERSION=0.1.3
+
 DESTDIR=~/.suckless
 BUILDDIR=~/.suckless-build
 
+die() {
+  echo "${@:2}"
+  exit $1
+}
+
 usage() {
-  echo "Usage: suckless-rebuild dmenu|slstatus|st <config.h>"
-  exit 1
+  die $1 "Usage: suckless-rebuild dmenu|slstatus|st <config.h>"
 }
 
-if [[ ${#@} != 2 || $1 =~ ^-h$|^--help$ || $2 =~ ^-h$|^--help$ ]]; then
-  usage
-fi
+version() {
+  die $1 "suckless-build $VERSION"
+}
+
+case $1 in
+  dmenu|slstatus|st ) software=$1; config=$2 ;;
+  -V|--version ) version 0 ;;
+  -h|--help) usage 0 ;;
+  * ) usage 1 ;;
+esac
 
-software=$1
-config=$2
+if [[ ${#@} != 2 ]]; then
+  usage 1
+fi
 
 if [[ ! $software =~ ^dmenu$|^slstatus$|^st$ ]]; then
-  echo "Unknown suckless software '$software'."
-  exit 1
+  die 1 "Unknown suckless software '$software'."
 fi
 if [[ ! -d /usr/src/$software ]]; then
-  echo "'an9wer-$software' may not be installed."
-  exit 1
+  die 1 "'an9wer-$software' may not be installed."
 fi
 if [[ ! -f $config ]]; then
-  echo "'$config' is not a regular file."
-  exit 1
+  die 1 "'$config' is not a regular file."
 fi
 
 # Move last build directory
@@ -36,7 +47,7 @@ fi
 
 mkdir -p "$BUILDDIR"
 cp -r /usr/src/$software "$BUILDDIR/$software"
-cp -f "$config" "$BUILDDIR/$software"
+cp -f "$config" "$BUILDDIR/$software/config.h"
 
 cd "$BUILDDIR/$software"
 if make &> build.log && make PREFIX="$DESTDIR" install &> build.log; then