diff --git a/Makefile b/Makefile index 65e118b90c9cf8e926d0fc5ad48db6e8b8193ea6..e4101d29e391ee5b52a0168e56591d4e35791252 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 fe3df60b96e66115a5071df3d97950929883fe87..3f27f3baafffe7aaf7c0e3b8705b0638c76a6c8d 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 69770e241c579de4d9d473a8aae9aa98425fce3b..4f5301f64f7e2ca2811d630c8ef75b355f0d2d77 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 863028a3e5f96838eef8e899d035926559e657e8..ca959b6a7bf126c2e457b60220a342d8939d13c8 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 418b7f4773e84fb7733ad59a7dfcb1a93dd6e8f3..0ca2af0b91c5787573216a8220b419f77bf274ae 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 9e11e9972e12ed2a766886b8c5a6f99634f90d8c..bdb4aeb886c9184cc3e45136deede79bcaea6a8e 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