diff options
| author | intrigeri <intrigeri@boum.org> | 2005-11-29 10:09:04 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2005-11-29 10:09:04 +0000 |
| commit | 13149b96008227bb11582fa0e0d59b727fd8d1bd (patch) | |
| tree | 51082e8ce3f52cb6381db6ec70d7b96927561dd2 /lib | |
| parent | a9074a138cade6e66e8d7a0e5f18cdb7c42ad169 (diff) | |
| download | backupninja-13149b96008227bb11582fa0e0d59b727fd8d1bd.tar.gz backupninja-13149b96008227bb11582fa0e0d59b727fd8d1bd.tar.bz2 | |
r3557@krups: intrigeri | 2005-11-15 14:41:32 +0100
Start to move common functions (maketemp) to lib/tools, and better use autotools for lib/{easydialog,tools}.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 14 | ||||
| -rw-r--r-- | lib/Makefile.in | 17 | ||||
| -rw-r--r-- | lib/easydialog.in (renamed from lib/easydialog.sh) | 2 | ||||
| -rw-r--r-- | lib/tools.in | 19 |
4 files changed, 45 insertions, 7 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 1a8ed4c..2b0e93a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,14 @@ +EXTRALIBS = easydialog tools +dist_pkglib_DATA = $(EXTRALIBS) +EXTRA_DIST = easydialog.in tools.in -EXTRALIBRARIES = easydialog.sh +edit = sed \ + -e "s,@BASH\@,$(BASH),g" -EXTRA_DIST = Makefile.am $(EXTRALIBRARIES) +easydialog: easydialog.in + rm -f easydialog + $(edit) easydialog.in > easydialog -dist_pkglib_DATA = $(EXTRALIBRARIES) +tools: tools.in + rm -f tools + $(edit) tools.in > tools diff --git a/lib/Makefile.in b/lib/Makefile.in index d462ea8..67a1df5 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -111,9 +111,12 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -EXTRALIBRARIES = easydialog.sh -EXTRA_DIST = Makefile.am $(EXTRALIBRARIES) -dist_pkglib_DATA = $(EXTRALIBRARIES) +EXTRALIBS = easydialog tools +dist_pkglib_DATA = $(EXTRALIBS) +EXTRA_DIST = easydialog.in tools.in +edit = sed \ + -e "s,@BASH\@,$(BASH),g" + all: all-am .SUFFIXES: @@ -285,6 +288,14 @@ uninstall-am: uninstall-dist_pkglibDATA uninstall-info-am pdf-am ps ps-am uninstall uninstall-am \ uninstall-dist_pkglibDATA uninstall-info-am + +easydialog: easydialog.in + rm -f easydialog + $(edit) easydialog.in > easydialog + +tools: tools.in + rm -f tools + $(edit) tools.in > tools # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/easydialog.sh b/lib/easydialog.in index 0113d9c..59b0efa 100644 --- a/lib/easydialog.sh +++ b/lib/easydialog.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # copyright 2002 lmoore@tump.com under the terms of the GNU LGPL. # additions 2005 collective@riseup.net diff --git a/lib/tools.in b/lib/tools.in new file mode 100644 index 0000000..89f2ff7 --- /dev/null +++ b/lib/tools.in @@ -0,0 +1,19 @@ +#!@BASH@ + + +# +# create a temporary file in a secure way. +# +function maketemp() { + if [ -x /bin/mktemp ] + then + local tempfile=`mktemp /tmp/$1.XXXXXXXX` + else + DATE=`date` + sectmp=`echo $DATE | /usr/bin/md5sum | cut -d- -f1` + local tempfile=/tmp/$1.$sectmp + fi + echo $tempfile +} + + |