Merge "Move dlux Sonar scan to Sonarcloud"

[releng/builder.git] / jjb / packaging / install-deb.sh

diff --git a/jjb/packaging/install-deb.sh b/jjb/packaging/install-deb.sh
index b53339e2d8bb71f2e63d967e46626bdb7edabad5..fbc6d90fa695639da382af09a54d835611ddf2a8 100644 (file)
--- a/jjb/packaging/install-deb.sh
+++ b/jjb/packaging/install-deb.sh
@@ -5,20 +5,24 @@
 #   -e: Fail on errors
 #   -o pipefail: Fail on errors in scripts this calls, give stacktrace
 set -ex -o pipefail
-
+PACKAGE=${PACKAGE:-"$WORKSPACE/packaging/packages/deb/opendaylight/*.deb"}
+URL_REGEX='(https?|ftp|file)://[-A-Za-z0-9\+&@#/%?=~_|!:,.;]*[-A-Za-z0-9\+&@#/%=~_|]'
 # Wait for any background apt processes to finish
 # There seems to be a backgroud apt process that locks /var/lib/dpkg/lock
 # and causes our apt commands to fail.
 while pgrep apt > /dev/null; do sleep 1; done
 
 # Install ODL from .deb link or .repo url
-if [[ $PACKAGE == *.deb ]]
+if [[ $PACKAGE =~ $URL_REGEX ]]
 then
   # shellcheck disable=SC2154
-  pkg_basename="${{PACKAGE##*/}}"
-  # NB: Apt can't install directly from URL, so need this intermediary file
+  pkg_basename="${PACKAGE##*/}"
   curl -L --silent -o "$pkg_basename" "$PACKAGE"
   sudo dpkg --install ./"$pkg_basename"
+elif [[ $PACKAGE == *.deb ]]
+then
+  echo "$PACKAGE"
+  sudo dpkg --install "$PACKAGE"
 elif [[ $PACKAGE == ppa:* ]]
 then
   sudo add-apt-repository "$PACKAGE"