Cadoles/Tamarin
21
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Wiki Activity

Fix include bug + add lintian package validation in check-install script

Browse Source
This commit is contained in:
William Petit 2015-07-04 18:42:08 +02:00
parent ab10d60215
commit 735575a961
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
check-install.sh
View File

@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
source ./lib/util.sh DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
source "$DIR/lib/util.sh"
function show_usage { function show_usage {
echo echo
@ -23,7 +24,7 @@ function create_container {
temp_dir="$(mktemp -d)" temp_dir="$(mktemp -d)"
# Link lib folder # Link lib folder
ln -s $(readlink -f ./lib) "$temp_dir/lib" ln -s $(readlink -f "$DIR/lib") "$temp_dir/lib"
# Create Dockerfile # Create Dockerfile
cat << EOF > "$temp_dir/Dockerfile" cat << EOF > "$temp_dir/Dockerfile"
@ -31,7 +32,7 @@ function create_container {
ENV DEBIAN_FRONTEND noninteractive 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 ADD ./lib /root/.tamarin
RUN chmod +x /root/.tamarin/install.sh RUN chmod +x /root/.tamarin/install.sh

3
lib/install.sh
View File

@ -5,6 +5,9 @@ set -e
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
source "${DIR}/util.sh" source "${DIR}/util.sh"
info "Analysing package $1..."
lintian "$1"
info "Updating packages definition..." info "Updating packages definition..."
apt-get update apt-get update

5
package-project.sh
View File

@ -2,7 +2,8 @@
set -e set -e
source ./lib/util.sh DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
source "$DIR/lib/util.sh"
function show_usage { function show_usage {
echo echo
@ -27,7 +28,7 @@ function create_container {
temp_dir="$(mktemp -d)" temp_dir="$(mktemp -d)"
# Link lib folder # Link lib folder
ln -s $(readlink -f ./lib) "$temp_dir/lib" ln -s $(readlink -f "$DIR/lib") "$temp_dir/lib"
# Create Dockerfile # Create Dockerfile
cat << EOF > "$temp_dir/Dockerfile" cat << EOF > "$temp_dir/Dockerfile"