X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mkdeb.sh;h=bb1a8904d3d1a8ffec752de130d0aba52ef20839;hb=75aca494aa4c58b43d76c6a91b1b2670e4836182;hp=b0ec56b870c023eb03d93f9eda217db8f3a3e847;hpb=ab0c1dd02ae593bd9640f4def4470e29e8706531;p=selector.git

diff --git a/mkdeb.sh b/mkdeb.sh
index b0ec56b..bb1a890 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -25,39 +25,44 @@
 # This script creates the Debian package. The way it does it is
 # probably not very conventional. I am open to suggestions.
 
-VERSION=1.0
+VERSION=1.0-R$(cat REVISION_NUMBER)
+PACKAGE=/tmp/selector_${VERSION}_i386.deb
 
-make -k
+BIN_PATH="usr/bin"
+MAN_PATH="usr/share/man/man1"
+
+make -j -k || exit 1
 
 TMP=`mktemp -d /tmp/deb.XXXXXX`
 
-for d in DEBIAN usr/bin usr/share/man/man1; do
+for d in DEBIAN ${BIN_PATH} ${MAN_PATH}; do
     mkdir -p ${TMP}/${d}
 done
 
-# LIBS=`ldd selector | grep "=> /" | awk '{print $3}'`
-# DEPS=`for l in ${LIBS}; do dpkg -S $l; done | cut -f 1 -d: | sort | uniq`
+LIB_DEPENDS=$(dpkg-shlibdeps -O ./selector | grep Depends | sed -e "s/^.*Depends=//")
 
 cat > ${TMP}/DEBIAN/control <<EOF
 Package: selector
 Version: ${VERSION}
 Maintainer: Francois Fleuret <francois@fleuret.org>
 Architecture: i386
-Depends: libncurses5, libstdc++6, libc6, libgcc1
-Description: A command line for dynamic string-matching.
+Depends: ${LIB_DEPENDS}
+Description: A command line for dynamic string-matching
  This is a command line for dynamic string selection. As you type a
- list of strings separated by ';', the display is updated in real time
- to show only the lines containing all the said strings. The main
- usage of selector is as an efficient search in the shell command
+ list of substrings separated by ';', or a regexp, the display is
+ updated in real time to show only the matching lines. The main usage
+ of selector is as an efficient search in the shell command
  history. With the correct option, it will inject the selected line
- into the virtual tty input buffer, hence allowing the user to edit
- the line and execute it as a standard command.
+ into the tty input buffer, hence allowing the user to edit the line
+ and execute it as a standard command.
 EOF
 
-cp ./selector ${TMP}/usr/bin
-cp ./selector.1 ${TMP}/usr/share/man/man1
-gzip ${TMP}/usr/share/man/man1/selector.1
+cp ./selector ${TMP}/${BIN_PATH}
+cp ./selector.1 ${TMP}/${MAN_PATH}
+gzip ${TMP}/${MAN_PATH}/selector.1
+
+dpkg-deb --build ${TMP} ${PACKAGE}
 
-dpkg-deb --build ${TMP} /tmp/selector_${VERSION}_i386.deb
+dpkg --contents ${PACKAGE}
 
 rm -rf ${TMP}