[vlc-commits] extras/tools: fix packages not found

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Oct 23 12:01:50 2018 +0200| [90bde4672ab311020435d1ef50d38a3c2c1e0fb4] | committer: Steve Lhomme

extras/tools: fix packages not found

It could happen when the version was not checked.

(cherry picked from commit 2c6b7238b49af56c4d8a4b913e318ced93255502)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=90bde4672ab311020435d1ef50d38a3c2c1e0fb4
---

 extras/tools/bootstrap | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 5faffd97e2..4c0794fea1 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -94,9 +94,12 @@ then
     NEEDED="$NEEDED nasm"
 else
     # found, need to check version ?
-    [ -z "$1" ] && return # no
-    gotver=`nasm -v | cut -d ' ' -f 3`
-    check_version nasm $gotver $1
+    if [ -z "$1" ];then
+        FOUND="$FOUND nasm"
+    else
+        gotver=`nasm -v | cut -d ' ' -f 3`
+        check_version nasm $gotver $1
+    fi
 fi
 }
 
@@ -107,9 +110,12 @@ then
     NEEDED="$NEEDED $1"
 else
     # found, need to check version ?
-    [ -z "$2" ] && return # no
-    gotver=`$1 --version | head -1 | sed s/'.* '//`
-    check_version $1 $gotver $2
+    if [ -z "$2" ];then
+        FOUND="$FOUND $1"
+    else
+        gotver=`$1 --version | head -1 | sed s/'.* '//`
+        check_version $1 $gotver $2
+    fi
 fi
 }
 
@@ -120,9 +126,12 @@ then
     NEEDED="$NEEDED $1"
 else
     # found, need to check version ?
-    [ -z "$2" ] && return # no
-    gotver=`$1 --version | head -1 | sed s/'.* '//`
-    check_version_majmin $1 $gotver $2
+    if [ -z "$2" ];then
+        FOUND="$FOUND $1"
+    else
+        gotver=`$1 --version | head -1 | sed s/'.* '//`
+        check_version_majmin $1 $gotver $2
+    fi
 fi
 }
 
@@ -167,7 +176,6 @@ case `uname` in
      ;;
 esac
 
-
 cat > Makefile << EOF
 MAKEFLAGS += -j$CPUS
 CMAKEFLAGS += --parallel=$CPUS