diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-14 10:46:07 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-14 12:07:13 +0200 |
| commit | 14fe545e05cafc573277fae2eb7953e1596f700f (patch) | |
| tree | ef43994e25bd3433a648f60f2a4f30cbad4af468 | |
| parent | 2aaf2a5ba46ca26b50daef8de488cbaadba847c7 (diff) | |
| download | ptxdist-14fe545e05cafc573277fae2eb7953e1596f700f.tar.gz ptxdist-14fe545e05cafc573277fae2eb7953e1596f700f.tar.xz | |
[url_check] use right ptxdist & ptxconfig
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rwxr-xr-x | plugins/url_check/main | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/url_check/main b/plugins/url_check/main index 13f6b9380..8a4985117 100755 --- a/plugins/url_check/main +++ b/plugins/url_check/main @@ -55,7 +55,7 @@ LINKCHECKER_BIN="linkchecker" URL_CHECKER="$LINKCHECKER_BIN --no-warnings" # URL_CHECKER="wget --spider" -PTXCONFIG="ptxconfig" +PTXCONFIG="selected_ptxconfig" logdir="`dirname $0`/log" logfile="$logdir/url_check_log" @@ -178,8 +178,12 @@ done init(){ # choose the right ptxdist version: echo "PATH is $PATH" - PTXDIST=$(echo `$GREP PTXCONF_CONFIGFILE_VERSION $PTXCONFIG` \; echo "ptxdist-\$PTXCONF_CONFIGFILE_VERSION" | sh) - which $PTXDIST || PTXDIST=ptxdist + PTXDIST_VERSION=$(echo `$GREP PTXCONF_CONFIGFILE_VERSION $PTXCONFIG` \; echo "\$PTXCONF_CONFIGFILE_VERSION" | sh) + PTXDIST=$(dirname $0)/../../bin/ptxdist + if [ "$($PTXDIST --version)" != "$PTXDIST_VERSION" ]; then + PTXDIST=ptxdist-$PTXDIST_VERSION + which $PTXDIST || PTXDIST=ptxdist + fi PTXDIST_BIN="`$WHICH $PTXDIST`" ptx_debug "PTXDIST is: $PTXDIST ($PTXDIST_BIN)" if [ "$1" = "all" ]; then |