Browse Source

fix git conflics

pull/1/head
Benedikt Kristinsson 10 months ago
parent
commit
4161121394
  1. 6
      build-amzn.sh
  2. 3
      build-debian.sh

6
build-amzn.sh

@ -10,9 +10,9 @@ DIST="$(pwd)/dist"
(
cd amzn/
docker build --build-arg PREFIX=$PREFIX --build-arg VERSION=$VERSION build-emacs-amzn .
wget -q https://ftp.gnu.org/pub/gnu/emacs/emacs-${VERSION}.tar.xz
docker run --rm -v $DIST:/emacs/dist -t build-emacs-amzn $1
docker build --build-arg PREFIX=$PREFIX --build-arg VERSION=$VERSION -t build-emacs-amzn .
docker run --rm -v $DIST:/emacs/dist build-emacs-amzn $1
)
# docker rmi build-emacs-amzn

3
build-debian.sh

@ -10,8 +10,9 @@ DIST="$(pwd)/dist"
(
cd debian/
docker build --build-arg VERSION=$VERSION -t build-emacs-debian .
wget -q https://ftp.gnu.org/pub/gnu/emacs/emacs-${VERSION}.tar.xz
docker build --build-arg VERSION=$VERSION -t build-emacs-debian .
docker run -v $DIST/:/emacs/dist --rm build-emacs-debian $1
)

Loading…
Cancel
Save