fixed directory changes in download script

1 files changed, 23 insertions, 20 deletions

diff --git a/scripts/download.sh b/scripts/download.sh
index 872fe8f..cf5c161 100755
--- a/scripts/download.sh
+++ b/scripts/download.sh
@@ -22,13 +22,13 @@ BASE=$(dirname ${SCRIPT})/..
 
 echo "Downloading software to '$BASE'/downloads"
 
+cd "${BASE}/downloads/" || exit 1
+
 if [ ! -f "${BASE}/downloads/tinycc-${TINYCC_VERSION}.tar.gz" ]; then
-	cd "${BASE}/downloads/"
 	git clone https://repo.or.cz/tinycc.git "tinycc-${TINYCC_VERSION}"
 	git -C "tinycc-${TINYCC_VERSION}" checkout "${TINYCC_VERSION}"
 	tar zcf "${BASE}/downloads/tinycc-${TINYCC_VERSION}.tar.gz" "tinycc-${TINYCC_VERSION}"
 	rm -rf "tinycc-${TINYCC_VERSION}"
-	cd ..
 fi
 
 if [ ! -f "${BASE}/downloads/musl-${MUSL_VERSION}.tar.gz" ]; then
@@ -40,48 +40,38 @@ if [ ! -f "${BASE}/downloads/oksh-${_OKSH_VERSION}.tar.gz" ]; then
 fi
 
 if [ ! -f "${BASE}/downloads/sbase-${SBASE_VERSION}.tar.gz" ]; then
-	cd "${BASE}/downloads/"
 	git clone git://git.suckless.org/sbase "sbase-${SBASE_VERSION}"
 	git -C "sbase-${SBASE_VERSION}" checkout "${SBASE_VERSION}"
 	tar zcf "${BASE}/downloads/sbase-${SBASE_VERSION}.tar.gz" "sbase-${SBASE_VERSION}"
 	rm -rf "sbase-${SBASE_VERSION}"
-	cd ..
 fi
 
 if [ ! -f "${BASE}/downloads/ubase-${UBASE_VERSION}.tar.gz" ]; then
-	cd "${BASE}/downloads/"
 	git clone git://git.suckless.org/ubase "ubase-${UBASE_VERSION}"
 	git -C "ubase-${UBASE_VERSION}" checkout "${UBASE_VERSION}"
 	tar zcf "${BASE}/downloads/ubase-${UBASE_VERSION}.tar.gz" "ubase-${UBASE_VERSION}"
 	rm -rf "ubase-${UBASE_VERSION}"
-	cd ..
 fi
 
 if [ ! -f "${BASE}/downloads/smdev-${SMDEV_VERSION}.tar.gz" ]; then
-	cd "${BASE}/downloads/"
 	git clone git://git.suckless.org/smdev "smdev-${SMDEV_VERSION}"
 	git -C "smdev-${SMDEV_VERSION}" checkout "${SMDEV_VERSION}"
 	tar zcf "${BASE}/downloads/smdev-${SMDEV_VERSION}.tar.gz" "smdev-${SMDEV_VERSION}"
 	rm -rf "smdev-${SMDEV_VERSION}"
-	cd ..
 fi
 
 if [ ! -f "${BASE}/downloads/sinit-${SINIT_VERSION}.tar.gz" ]; then
-	cd "${BASE}/downloads/"
 	git clone git://git.suckless.org/sinit "sinit-${SINIT_VERSION}"
 	git -C "sinit-${SINIT_VERSION}" checkout "${SINIT_VERSION}"
 	tar zcf "${BASE}/downloads/sinit-${SINIT_VERSION}.tar.gz" "sinit-${SINIT_VERSION}"
 	rm -rf "sinit-${SINIT_VERSION}"
-	cd ..
 fi
 
 if [ ! -f "${BASE}/downloads/sdhcp-${SDHCP_VERSION}.tar.gz" ]; then
-	cd "${BASE}/downloads/"
 	git clone git://git.2f30.org/sdhcp "sdhcp-${SDHCP_VERSION}"
 	git -C "sdhcp-${SDHCP_VERSION}" checkout "${SDHCP_VERSION}"
 	tar zcf "${BASE}/downloads/sdhcp-${SDHCP_VERSION}.tar.gz" "sdhcp-${SDHCP_VERSION}"
 	rm -rf "sdhcp-${SDHCP_VERSION}"
-	cd ..
 fi
 
 if [ ! -f "${BASE}/downloads/netbsd-curses-${NETBSD_NCURSES_VERSION}.tar.gz" ]; then
@@ -93,18 +83,14 @@ if [ ! -f "${BASE}/downloads/libtermkey-${LIBTERMKEY_VERSION}.tar.gz" ]; then
 fi
 
 if [ ! -f "${BASE}/downloads/libevent-${LIBEVENT_VERSION}.tar.gz" ]; then
-	cd "${BASE}/downloads/"
 	wget "https://github.com/libevent/libevent/releases/download/release-${LIBEVENT_VERSION}/libevent-${LIBEVENT_VERSION}.tar.gz"
-	cd ..
 fi
 
 if [ ! -f "${BASE}/downloads/vis-${VIS_VERSION}.tar.gz" ]; then
-	cd "${BASE}/downloads/"
 	git clone https://github.com/martanne/vis.git "vis-${VIS_VERSION}"
 	git -C "vis-${VIS_VERSION}" checkout "${VIS_VERSION}"
 	tar zcf "${BASE}/downloads/vis-${VIS_VERSION}.tar.gz" "vis-${VIS_VERSION}"
 	rm -rf "vis-${VIS_VERSION}"
-	cd ..
 fi
 
 if [ ! -f "${BASE}/downloads/tmux-${TMUX_VERSION}.tar.gz" ]; then
@@ -121,12 +107,10 @@ if [ ! -f "${BASE}/downloads/mandoc-${MANDOC_VERSION}.tar.gz" ]; then
 fi
 
 if [ ! -f "${BASE}/downloads/abase-${ABASE_VERSION}.tar.gz" ]; then
-	cd "${BASE}/downloads/"
 	git clone git://git.andreasbaumann.cc/abase.git "abase-${ABASE_VERSION}"
 	git -C "abase-${ABASE_VERSION}" checkout "${ABASE_VERSION}"
 	tar zcf "${BASE}/downloads/abase-${ABASE_VERSION}.tar.gz" "abase-${ABASE_VERSION}"
 	rm -rf "abase-${ABASE_VERSION}"
-	cd ..
 fi
 
 if [ ! -f "${BASE}/downloads/nbd-${NBD_VERSION}.tar.gz" ]; then
@@ -145,13 +129,30 @@ if [ ! -f "${BASE}/downloads/joe-${JOE_VERSION}.tar.gz" ]; then
 	wget -O "${BASE}/downloads/joe-${JOE_VERSION}.tar.gz" "https://netcologne.dl.sourceforge.net/project/joe-editor/JOE%20sources/joe-${JOE_VERSION}/joe-${JOE_VERSION}.tar.gz"
 fi
 
+if [ ! -f "${BASE}/downloads/tinyxlib-${TINYXLIB_VERSION}.tar.gz" ]; then
+	git clone https://github.com/idunham/tinyxlib.git "tinyxlib-${TINYXLIB_VERSION}"
+	git -C "tinyxlib-${TINYXLIB_VERSION}" checkout "${TINYXLIB_VERSION}"
+	tar zcf "${BASE}/downloads/tinyxlib-${TINYXLIB_VERSION}.tar.gz" "tinyxlib-${TINYXLIB_VERSION}"
+	rm -rf "tinyxlib-${TINYXLIB_VERSION}"
+fi
+
+if [ ! -f "${BASE}/downloads/tinyxserver-${TINYXSERVER_VERSION}.tar.gz" ]; then
+	git clone https://github.com/idunham/tinyxserver.git "tinyxserver-${TINYXSERVER_VERSION}"
+	git -C "tinyxserver-${TINYXSERVER_VERSION}" checkout "${TINYXSERVER_VERSION}"
+	tar zcf "${BASE}/downloads/tinyxserver-${TINYXSERVER_VERSION}.tar.gz" "tinyxserver-${TINYXSERVER_VERSION}"
+	rm -rf "tinyxserver-${TINYXSERVER_VERSION}"
+fi
+
+if [ ! -f "${BASE}/downloads/rxvt-${RXVT_VERSION}.tar.gz" ]; then
+	wget -O "${BASE}/downloads/rxvt-${RXVT_VERSION}.tar.gz" \
+		"https://sourceforge.net/projects/rxvt/files/rxvt/${RXVT_VERSION}/rxvt-${RXVT_VERSION}.tar.gz/download"
+fi
+
 if [ ! -f "${BASE}/downloads/uflbbl-${UFLBBL_VERSION}.tar.gz" ]; then
-	cd "${BASE}/downloads/"
 	git clone git://git.andreasbaumann.cc/uflbbl.git "uflbbl-${UFLBBL_VERSION}"
 	git -C "uflbbl-${UFLBBL_VERSION}" checkout "${UFLBBL_VERSION}"
 	tar zcf "${BASE}/downloads/uflbbl-${UFLBBL_VERSION}.tar.gz" "uflbbl-${UFLBBL_VERSION}"
 	rm -rf "uflbbl-${UFLBBL_VERSION}"
-	cd ..
 fi
 
 if [ ! -f "${BASE}/downloads/linux-${LINUX_KERNEL_VERSION}.tar.gz" ]; then
@@ -162,6 +163,8 @@ if [ ! -f "${BASE}/downloads/dropbear-${DROPBEAR_VERSION}.tar.bz2" ]; then
 	wget -O "${BASE}/downloads/dropbear-${DROPBEAR_VERSION}.tar.bz2" "https://matt.ucc.asn.au/dropbear/releases/dropbear-${DROPBEAR_VERSION}.tar.bz2"
 fi
 
+cd .. || exit 1
+
 trap - 0
 
 exit 0