From: Ulrich Dangel <uli@spamt.net>
Date: Thu, 3 Dec 2009 20:43:02 +0000 (+0100)
Subject: Switched order of including cmdlineopts.clp, first check local directory
X-Git-Tag: v0.33~13
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=818e52abdc2bd149d994d55febf3f5435255a21b;hp=3067ce85df1efd3fec199d5ebb079ff5ec2d93ee

Switched order of including cmdlineopts.clp, first check local directory
and afterwards system directory.
---

diff --git a/grml-debootstrap b/grml-debootstrap
index 2544c85..83ae0d3 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -104,10 +104,10 @@ fi
 
 # cmdline handling {{{
 # source external command line parameter-processing script
-if [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then
-   . /usr/share/grml-debootstrap/functions/cmdlineopts.clp
-elif [ -r ./cmdlineopts.clp ] ; then
+if [ -r ./cmdlineopts.clp ] ; then
    . ./cmdlineopts.clp
+elif [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then
+   . /usr/share/grml-debootstrap/functions/cmdlineopts.clp
 else
    echo "Error: cmdline function file not found, exiting.">&2
    exit 1