From 14a89c618fb004e8ae2a8f59dc5a6c0c5cdbd04c Mon Sep 17 00:00:00 2001 From: Dirk Engling Date: Mon, 24 Feb 2014 03:15:11 +0100 Subject: Obey new layout --- makecolumns.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/makecolumns.sh b/makecolumns.sh index 0f9c5ba..4acbdd8 100755 --- a/makecolumns.sh +++ b/makecolumns.sh @@ -3,7 +3,7 @@ export LANG=C export LC_CTYPE=C export LC_ALL=C -export PATH=${PATH}:`pwd`/../bin/ +export PATH=${PATH}:`pwd`/bin/ main() { [ -f /usr/local/bin/el ] && EL=/usr/local/bin/el @@ -23,10 +23,10 @@ main() { make binaries printf "Cleaning up old working directory ... " - rm -rf ../work_`basename "${1#white_}"` + rm -rf work/`basename "${1#white_}"` printf "done.\n" - mkdir -p ../work_`basename "${1#white_}"` - cd ../work_`basename "${1#white_}"` || exit 1 + mkdir -p work/`basename "${1#white_}"` + cd work/`basename "${1#white_}"` || exit 1 if [ -f "$1/phonebook.db" ]; then handle_format_version_3 "${1}" @@ -37,7 +37,7 @@ main() { else echo "Not a recognized Telefonbuch folder" fi - cd .. + cd ../.. } do_decompress_version_2() { -- cgit v1.2.3