summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-11-22 14:40:20 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:16:26 +0100
commit5e4952e8a796851369073d47e375e97c072e040f (patch)
tree102412a488c35606ad867bbfa468d21366078ea6 /functions
parentaf64109b622dd1a33cb9052d33a58557bef44503 (diff)
downloadvyos-live-build-5e4952e8a796851369073d47e375e97c072e040f.tar.gz
vyos-live-build-5e4952e8a796851369073d47e375e97c072e040f.zip
Adding debian version 2.0~a1-1.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/common.sh2
-rwxr-xr-xfunctions/defaults.sh8
-rwxr-xr-xfunctions/legacy.sh18
3 files changed, 5 insertions, 23 deletions
diff --git a/functions/common.sh b/functions/common.sh
index 2be9e5421..184ebe006 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -9,7 +9,7 @@
PROGRAM="$(basename ${0})"
PACKAGE="live-helper"
-VERSION="1.0.6-1"
+VERSION="2.0~a1-1"
CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
PATH="${PWD}/scripts:${PATH}"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 399c582e9..30cdfc6f7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -405,16 +405,16 @@ Set_defaults ()
esac
fi
- # Setting categories value
- if [ -z "${LH_CATEGORIES}" ]
+ # Setting archive areas value
+ if [ -z "${LH_ARCHIVE_AREAS}" ]
then
case "${LH_MODE}" in
ubuntu)
- LH_CATEGORIES="main restricted"
+ LH_ARCHIVE_AREAS="main restricted"
;;
*)
- LH_CATEGORIES="main"
+ LH_ARCHIVE_AREAS="main"
;;
esac
fi
diff --git a/functions/legacy.sh b/functions/legacy.sh
deleted file mode 100755
index 422c20d38..000000000
--- a/functions/legacy.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# legacy.sh - handle live-helper 2.x warnigns
-# Copyright (C) 2006-2009 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-# Obsoleting 'lh_foo_bar' calls in favour for 'lh foo_bar'
-
-BASENAME="$(basename ${0})"
-
-if [ -z "${LH}" ] && [ "$(echo ${BASENAME} | awk '{ print $1 }')" != "lh" ]
-then
- Echo_warning "live-helper 2.0 will deprecate all dashed forms of commands."
- Echo_warning "Please use \'$(echo ${BASENAME} | sed -e 's|lh_|lh |')\' instead of \'${BASENAME}\'."
-fi