diff options
| -rwxr-xr-x | buildinstaller.sh | 3 | ||||
| -rw-r--r-- | ext/installfiles/linux/install.tmpl.sh | 4 | ||||
| -rw-r--r-- | make-linux.mk | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/buildinstaller.sh b/buildinstaller.sh index 0708380b..04a614a4 100755 --- a/buildinstaller.sh +++ b/buildinstaller.sh @@ -52,6 +52,7 @@ case "$system" in cp -fp 'ext/installfiles/linux/init.d/zerotier-one' 'build-installer/etc/init.d' targ="ZeroTierOneInstaller-linux-${machine}-${vmajor}_${vminor}_${revision}" + # Use gzip in Linux since some minimal Linux systems do not have bunzip2 rm -f build-installer-tmp.tar.gz cd build-installer tar -cf - * | gzip -9 >../build-installer-tmp.tar.gz @@ -60,6 +61,7 @@ case "$system" in cat ext/installfiles/linux/install.tmpl.sh build-installer-tmp.tar.gz >$targ chmod 0755 $targ rm -f build-installer-tmp.tar.gz + ls -l $targ ;; @@ -86,6 +88,7 @@ case "$system" in cat ext/installfiles/mac/install.tmpl.sh build-installer-tmp.tar.bz2 >$targ chmod 0755 $targ rm -f build-installer-tmp.tar.bz2 + ls -l $targ ;; diff --git a/ext/installfiles/linux/install.tmpl.sh b/ext/installfiles/linux/install.tmpl.sh index 87359306..c32b2cab 100644 --- a/ext/installfiles/linux/install.tmpl.sh +++ b/ext/installfiles/linux/install.tmpl.sh @@ -45,9 +45,9 @@ fi echo 'Extracting files...' if [ $dryRun -gt 0 ]; then - echo ">> dry run: tail -c +$blobStart \"$scriptPath\" | bunzip2 -c | tar -xvop -C / -f -" + echo ">> dry run: tail -c +$blobStart \"$scriptPath\" | gunzip -c | tar -xvop -C / -f -" else - tail -c +$blobStart "$scriptPath" | bunzip2 -c | tar -xvop -C / -f - + tail -c +$blobStart "$scriptPath" | gunzip -c | tar -xvop -C / -f - fi if [ $dryRun -eq 0 -a ! -d "/var/lib/zerotier-one" ]; then diff --git a/make-linux.mk b/make-linux.mk index d3667c6c..964183c4 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -49,6 +49,6 @@ installer: one FORCE ./buildinstaller.sh clean: - rm -rf $(OBJS) file2lz4c zerotier-* zt1-*-install installer-build build-ZeroTierUI-* + rm -rf $(OBJS) zerotier-* build-* ZeroTierOneInstaller-* FORCE: |