diff options
| author | root <root@dasajuma.(none)> | 2010-09-02 11:13:17 +0200 |
|---|---|---|
| committer | root <root@dasajuma.(none)> | 2010-09-02 11:13:17 +0200 |
| commit | 05e2314e1bf90e66c3c70e8241a456ad6de81463 (patch) | |
| tree | 1df348a8edf593de54e9e31d9cf4a9c8c7cfe905 | |
| parent | 8e0d211bf674953f2830830e27cb80a8b720ef17 (diff) | |
| download | kanotix-05e2314e1bf90e66c3c70e8241a456ad6de81463.zip kanotix-05e2314e1bf90e66c3c70e8241a456ad6de81463.tar.gz | |
removed downloading of kanotix-scripts from clean
| -rwxr-xr-x | auto/build | 5 | ||||
| -rwxr-xr-x | auto/clean | 4 | ||||
| -rwxr-xr-x | auto/config | 5 | ||||
| -rw-r--r-- | config/chroot_local-includes/etc/kanotix-version | 2 | ||||
| -rw-r--r-- | scripts.urls | 8 |
5 files changed, 22 insertions, 2 deletions
@@ -1,3 +1,6 @@ -#!/bin/sh +#!/bin/bash + +# Update kanotix-version timestamp +perl -pi -e "s|[0-9]+-[0-9]+:[0-9]+|$(date +%Y%m%d-%H:%M)|" > config/chroot_local-includes/etc/kanotix-version lh build noauto ${@} 2>&1 | tee binary.log @@ -5,6 +5,9 @@ rm -f build.log # Remove generated files rm -f config/binary config/bootstrap config/chroot config/common config/source +# remove kanotix-scripts +grep -oe '^[^ #]*' scripts.urls | grep -oe '[^/]*$' | xargs -i rm -f config/chroot_local-includes/usr/local/bin/{} + # Remove empty directories in config tree if ls config/*/ > /dev/null 2>&1 then @@ -15,3 +18,4 @@ if [ -d config ] then rmdir --ignore-fail-on-non-empty config fi + diff --git a/auto/config b/auto/config index 018610c..97eb577 100755 --- a/auto/config +++ b/auto/config @@ -59,3 +59,8 @@ lh config noauto \ --packages-lists "standard-x11" \ ${@} +# Fetch kanotix-scripts if necessary +mkdir -p config/chroot_local-includes/usr/local/bin +grep -oe '^[^ #]*' scripts.urls | wget -i- -c -N -q -P config/chroot_local-includes/usr/local/bin +chmod 755 config/chroot_local-includes/usr/local/bin/*.sh + diff --git a/config/chroot_local-includes/etc/kanotix-version b/config/chroot_local-includes/etc/kanotix-version index 848ae27..d9e9c23 100644 --- a/config/chroot_local-includes/etc/kanotix-version +++ b/config/chroot_local-includes/etc/kanotix-version @@ -1 +1 @@ -Kanotix Hellfire acritoxtest +Kanotix Hellfire 20100902-10:32 diff --git a/scripts.urls b/scripts.urls new file mode 100644 index 0000000..36b4948 --- /dev/null +++ b/scripts.urls @@ -0,0 +1,8 @@ +# list of scripts that will be fetched to config/chroot_local-includes/usr/local/bin/ when "lh config" is called +# they will be removed on "lh clean" +http://kanotix.com/files/fix/update-scripts-kanotix.sh +http://kanotix.com/files/install-nvidia-debian.sh +http://kanotix.com/files/install-fglrx-debian.sh +http://kanotix.com/files/fix/force-vesa.sh +http://kanotix.com/files/install-flash-local.sh + |