From c5f03c90975275aa8c3a797daab7aac22458c1dd Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Wed, 9 Jan 2019 01:04:07 +0100 Subject: [PATCH] configure -help --- configure | 2 +- quantum_package.rc | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c6d3e7fb..55e4db19 100755 --- a/configure +++ b/configure @@ -48,7 +48,7 @@ while : ; do -i|--install) PACKAGES="${PACKAGE} $2" shift;; - -h|--help) + -h|-help|--help) help;; *) echo "unknown option $1, try --help" diff --git a/quantum_package.rc b/quantum_package.rc index 84e56201..808fb8e0 100644 --- a/quantum_package.rc +++ b/quantum_package.rc @@ -2,6 +2,7 @@ # This script loads the Quantum Package environment. It should be invoked as # source quantum_package.rc + QP_ROOT="/NOT/FOUND" case "$(ps -p $$ -ocomm=)" in zsh) @@ -11,9 +12,13 @@ case "$(ps -p $$ -ocomm=)" in QP_ROOT=$(dirname ${BASH_SOURCE}[0]) ;; esac + export QP_ROOT="$( cd $QP_ROOT ; pwd -P )" + + WD=$PWD + cd $QP_ROOT/etc for SCRIPT in *.rc do @@ -21,10 +26,12 @@ do done cd $WD + + if [[ -z ${QP_ROOT} ]] then echo The QP_ROOT environment variable is not set. Run - ./configure -help + ./configure --help fi