From 48d41afb7340242c0a002d4393b8460c6013ff1b Mon Sep 17 00:00:00 2001
From: Dino Korah <codemedic@users.noreply.github.com>
Date: Sat, 27 May 2023 16:11:57 +0100
Subject: [PATCH 1/2] Update build.sh

* Updates version to v9.0.1582
* Use curl to download
* Untar the tarball on-the-fly
* Use upx to compress the binary (saves ~50% binary size)
* Adds some comments & breaks long lines
---
 build.sh | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index adbb20b..90bc0d8 100755
--- a/build.sh
+++ b/build.sh
@@ -1,15 +1,41 @@
 #!/bin/bash
 
-docker run -i --rm -v "$PWD":/out -w /root alpine /bin/sh <<EOF
-apk add gcc make musl-dev ncurses-static
-wget https://github.com/vim/vim/archive/v8.1.1045.tar.gz
-tar xvfz v8.1.1045.tar.gz
+docker run -i --rm -e vim_version=9.0.1582 -v "$PWD":/out -w /root alpine /bin/sh <<EOF
+set -e
+
+# install build-time dependencies
+apk add gcc make musl-dev ncurses-static curl upx
+
+# download vim tarball and extract it
+curl -Ls https://github.com/vim/vim/archive/refs/tags/v\$vim_version.tar.gz | tar xz
 cd vim-*
-LDFLAGS="-static" ./configure --disable-channel --disable-gpm --disable-gtktest --disable-gui --disable-netbeans --disable-nls --disable-selinux --disable-smack --disable-sysmouse --disable-xsmp --enable-multibyte --with-features=huge --without-x --with-tlib=ncursesw
-make
+
+# configure, compile and install
+LDFLAGS="-static" \
+	./configure --disable-channel \
+		--disable-gpm \
+		--disable-gtktest \
+		--disable-gui \
+		--disable-netbeans \
+		--disable-nls \
+		--disable-selinux \
+		--disable-smack \
+		--disable-sysmouse \
+		--disable-xsmp \
+		--enable-multibyte \
+		--with-features=huge \
+		--without-x \
+		--with-tlib=ncursesw
+make -j3
 make install
+
+# copy compiled output
 mkdir -p /out/vim
 cp -r /usr/local/* /out/vim
-strip /out/bin/vim
+
+# make it smaller
+strip /out/vim/bin/vim
+upx /out/vim/bin/vim
+
 chown -R $(id -u):$(id -g) /out/vim
 EOF

From bdc0ed013a2f73189772ce3aa33abb39cbd0515b Mon Sep 17 00:00:00 2001
From: Dino Korah <dckorah@gmail.com>
Date: Sat, 27 May 2023 15:15:42 +0000
Subject: [PATCH 2/2] Fix alpine docker image to v3.18

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 90bc0d8..f26f889 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-docker run -i --rm -e vim_version=9.0.1582 -v "$PWD":/out -w /root alpine /bin/sh <<EOF
+docker run -i --rm -e vim_version=9.0.1582 -v "$PWD":/out -w /root alpine:3.18 /bin/sh <<EOF
 set -e
 
 # install build-time dependencies