summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-05-06 11:13:16 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-05-06 11:13:16 +0000
commit17c8c0e3af7932edb6bd4fa0fa6e32b8205d6928 (patch)
tree0d01873329b4184073c01af316e1ff6066ff25cd
parentec0c7a74bbf5824adc4efa54e1f91984ac870a8e (diff)
downloadalpine-conf-17c8c0e3af7932edb6bd4fa0fa6e32b8205d6928.tar.bz2
alpine-conf-17c8c0e3af7932edb6bd4fa0fa6e32b8205d6928.tar.xz
fixed VERSION in makefile and massed up .in files
-rw-r--r--Makefile2
-rw-r--r--albootstrap.in2
-rw-r--r--lbu.in14
-rw-r--r--setup-ads.in2
-rw-r--r--setup-alpine.in2
-rw-r--r--setup-webconf.in2
6 files changed, 18 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 65e118b..e4101d2 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ WWW="http://alpinelinux.org/alpine-conf"
SED := sed
TAR := tar
-SED_REPLACE := -i -e 's:@VERSION@:$(VERSION):g' \
+SED_REPLACE := -e 's:@VERSION@:$(VERSION):g' \
-e 's:@PREFIX@:$(PREFIX):g'
.SUFFIXES: .sh.in .in
diff --git a/albootstrap.in b/albootstrap.in
index fe3df60..3f27f3b 100644
--- a/albootstrap.in
+++ b/albootstrap.in
@@ -2,7 +2,7 @@
# bootstrap an alpine installation
-VERSION=2.0_alpha7
+VERSION=@VERSION@
usage() {
echo "usage: $(basename $0) TARGETDIR"
diff --git a/lbu.in b/lbu.in
index 69770e2..4f5301f 100644
--- a/lbu.in
+++ b/lbu.in
@@ -4,7 +4,7 @@
# Copyright (c) 2006 Natanael Copa
# May be distributed under GPL2
-VERSION=2.0_alpha7
+VERSION=@VERSION@
sysconfdir=@sysconfdir@
if [ ! -f ${libalpine:="./libalpine.sh"} ]; then
@@ -491,6 +491,18 @@ Options:
exit 1
}
+cmd_status() {
+ if [ -n "$USE_DEFAULT" ]; then
+ apk audit --backup
+ return 0
+ fi
+ # unpack old apkovl to tmpdir/a
+ # generate new apkovl and extract to tmpdir/b
+ # show files that exists in a but not in b as deleted
+ # compare files in b with files in a
+ # cleanup
+}
+
#-----------------------------------------------------------
diff --git a/setup-ads.in b/setup-ads.in
index 863028a..ca959b6 100644
--- a/setup-ads.in
+++ b/setup-ads.in
@@ -11,7 +11,7 @@
# * suggest DC server(s) based on
# $(dig _kerberos._tcp.dc._msdcs.$DOMAIN SRV +short)
-VERSION=2.0_alpha7
+VERSION=@VERSION@
PROGRAM=setup-ads
. $PREFIX/lib/libalpine.sh
diff --git a/setup-alpine.in b/setup-alpine.in
index 418b7f4..0ca2af0 100644
--- a/setup-alpine.in
+++ b/setup-alpine.in
@@ -1,7 +1,7 @@
#!/bin/sh
PROGRAM=setup-alpine
-VERSION=2.0_alpha7
+VERSION=@VERSION@
PREFIX=
. $PREFIX/lib/libalpine.sh
diff --git a/setup-webconf.in b/setup-webconf.in
index 9e11e99..bdb4aeb 100644
--- a/setup-webconf.in
+++ b/setup-webconf.in
@@ -1,7 +1,7 @@
#!/bin/sh
PROGRAM=setup-acf
-VERSION=2.0_alpha7
+VERSION=@VERSION@
PREFIX=
. $PREFIX/lib/libalpine.sh