diff --git a/Dockerfile b/Dockerfile index ff6243c..4f19fa6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,8 @@ ENV KEYSERVER keyserver.ubuntu.com ENV GNUPGHOME /.gnupg +ENV HOME /tmp + # install aptly RUN echo deb http://repo.aptly.info/ squeeze main >> /etc/apt/sources.list RUN apt-key adv --keyserver keys.gnupg.net --recv-keys E083A3782A194991 diff --git a/debify.sh b/debify.sh index 2dfecd2..4436003 100755 --- a/debify.sh +++ b/debify.sh @@ -44,18 +44,20 @@ aptly publish repo \ -passphrase="$passphrase" \ $APTLY_REPO_NAME -mv ~/.aptly/public /repo +REPO=${HOME}/repo + +mv ~/.aptly/public "$REPO" if [ ! -z "$KEYSERVER" ] && [ ! -z "$URI" ] then - release_sig_path=$(find /repo/dists -name Release.gpg | head -1) + release_sig_path=$(find "$REPO/dists" -name Release.gpg | head -1) gpg_key_id=$(gpg --list-packets $release_sig_path | grep -oP "(?<=keyid ).+") - echo "# setup script for $URI" > /repo/go + echo "# setup script for $URI" > "$REPO/go" case "$URI" in https://*) - cat >> /repo/go <<-END + cat >> "$REPO/go" <<-END if [ ! -e /usr/lib/apt/methods/https ] then apt-get update @@ -64,7 +66,7 @@ fi END esac - cat >> /repo/go <<-END + cat >> "$REPO/go" <<-END apt-key adv --keyserver $KEYSERVER --recv-keys $gpg_key_id echo "deb $URI $APTLY_DISTRIBUTION $APTLY_COMPONENT" >> /etc/apt/sources.list @@ -72,4 +74,4 @@ apt-get update END fi -tar -C /repo -czf /debs/repo.tar.gz . +tar -C "$REPO" -czf /debs/repo.tar.gz .