From bc9410c557506fa9f497c4e7d5c0b3a87e5002ae Mon Sep 17 00:00:00 2001 From: knittl Date: Fri, 3 Oct 2008 11:01:39 +0000 Subject: =?UTF-8?q?neo.conf=20ins=20(richtige)=20verzeichnis=20etc=20versc?= =?UTF-8?q?hoben=20patch=20von=20bernd=20f=C3=BCr=20num=20und=20neo=20eing?= =?UTF-8?q?espielt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.neo-layout.org@931 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- linux/bin/neo | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'linux/bin/neo') diff --git a/linux/bin/neo b/linux/bin/neo index 8923706..2753971 100755 --- a/linux/bin/neo +++ b/linux/bin/neo @@ -1,14 +1,23 @@ #!/bin/sh -# Verzeichnis muss eventuell an den Ort der neo20.txt angepasst werden: -NEO_TXT=$HOME/neo/A-REFERENZ-A/neo20.txt +if [ -f "${NEO_CONFIG}" ]; then + . "${NEO_CONFIG}" || die "Failed to source ${NEO_CONFIG}" +elif [ -f "${HOME}"/.neorc ]; then + . "${HOME}"/.neorc || die "Failed to source ${HOME}/.neorc" +elif [ -f /etc/neo.conf ]; then + . /etc/neo.conf || die "Failed to source /etc/neo.conf" +else + echo "No configuration file found. Using default values, this might fail!" +fi + +NEO_REFERENCE=${NEO_REFERENCE:-/usr/share/neo-layout/neo20-reference.txt} if [ 0 = $# ]; then - grep -m 1 -B 15 "┴──────┘" $NEO_TXT + grep -m 1 -B 15 "┴──────┘" "${NEO_REFERENCE}" else for NUM in $@; do if [ $(($NUM)) -ge 1 -a $(($NUM)) -le 6 ]; then - grep -B 11 -m "$NUM" "└───┴──┴──┴───────────┴──┴──┴──┴───┘" $NEO_TXT | tail -n 12 + grep -B 11 -m "$NUM" "└───┴──┴──┴───────────┴──┴──┴──┴───┘" "${NEO_REFERENCE}" | tail -n 12 else echo "Benutzung: `basename $0` [1-6]" echo " Wenn der Aufruf ohne Zahl erfolgt, werden alle Ebenen ausgegeben." -- cgit v1.2.3