Parameterize and clean up, now that basic hack seems to work.

1 files changed, 9 insertions, 8 deletions

diff --git a/Builder b/Builder
index b74f92d..48a3557 100755
--- a/Builder
+++ b/Builder
@@ -5,20 +5,19 @@ set -ex
 sed -i '/mount -t proc /d; /mount -t sysfs /d' /debootstrap/functions
 /debootstrap/debootstrap --second-stage
 
+ls -ld "${XILINX_PKGDIR}"
+
+RAT_PACKAGES='libglib2.0-0 libxrandr2 python-xvfbwrapper ratpoison'
+
 apt-get update
 
-apt-get install -y \
-    libglib2.0-0 \
-    libxrandr2 \
-    python-xvfbwrapper \
-    ratpoison \
-    sudo
+apt-get install -y ${RAT_PACKAGES} sudo
 
 adduser --disabled-password --gecos 'Cryptech Build Bot' --shell /bin/sh builder
 
 echo >/etc/sudoers.d/builder 'builder ALL = (ALL) NOPASSWD: SETENV: ALL'
 
-install -o builder -g builder /cryptech-builder/Xilinx.lic /home/builder/Xilinx.lic
+install -o builder -g builder /cryptech-builder/${XILINX_LICENSE} /home/builder/${XILINX_LICENSE}
 
 ln -sf /bin/bash /bin/sh
 
@@ -26,4 +25,6 @@ ln -sf /bin/bash /bin/sh
 
 chown -R builder:builder /home/builder
 
-rm -rf /Xilinx_ISE_DS_Lin_14.7_1015_1 /home/builder/Xilinx.lic
+rm /home/builder/${XILINX_LICENSE}
+
+apt-get remove -y --purge --autoremove ${RAT_PACKAGES}