diff --git a/check-install.sh b/check-install.sh index 2faa228..4a84594 100755 --- a/check-install.sh +++ b/check-install.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -source ./lib/util.sh +DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source "$DIR/lib/util.sh" function show_usage { echo @@ -23,7 +24,7 @@ function create_container { temp_dir="$(mktemp -d)" # Link lib folder - ln -s $(readlink -f ./lib) "$temp_dir/lib" + ln -s $(readlink -f "$DIR/lib") "$temp_dir/lib" # Create Dockerfile cat << EOF > "$temp_dir/Dockerfile" @@ -31,7 +32,7 @@ function create_container { ENV DEBIAN_FRONTEND noninteractive - RUN apt-get update && apt-get install --yes gdebi-core + RUN apt-get update && apt-get install --yes gdebi-core lintian ADD ./lib /root/.tamarin RUN chmod +x /root/.tamarin/install.sh diff --git a/lib/install.sh b/lib/install.sh index 775793c..e2724d2 100644 --- a/lib/install.sh +++ b/lib/install.sh @@ -5,6 +5,9 @@ set -e DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) source "${DIR}/util.sh" +info "Analysing package $1..." +lintian "$1" + info "Updating packages definition..." apt-get update diff --git a/package-project.sh b/package-project.sh index 450d7b3..d68f264 100755 --- a/package-project.sh +++ b/package-project.sh @@ -2,7 +2,8 @@ set -e -source ./lib/util.sh +DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source "$DIR/lib/util.sh" function show_usage { echo @@ -27,7 +28,7 @@ function create_container { temp_dir="$(mktemp -d)" # Link lib folder - ln -s $(readlink -f ./lib) "$temp_dir/lib" + ln -s $(readlink -f "$DIR/lib") "$temp_dir/lib" # Create Dockerfile cat << EOF > "$temp_dir/Dockerfile"