No longer install PuTTY and other windows binaries

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 2586fd0..d5b1fb0 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -177,12 +177,6 @@
 # the mksquashfs option -ef:
 # SQUASHFS_EXCLUDES_FILE="/etc/grml/fai/squashfs-excludes"
 
-# Skip download of pageant, plink, pscp, psftp, putty and puttygen
-# using wget to store it inside $BUILD_OUTPUT/windows/?
-# NO_WINDOWS_BINARIES="1"
-# URL for downloading the windows files:
-# WINDOWS_BINARIES="http://the.earth.li/~sgtatham/putty/latest/x86/"
-
 # Do you want to exit grml-live if some packages were requested for installation
 # on fresh installs but are missing on the generated ISO finally?
 # By default the package list is sent to stdout but grml-live doesn't interrupt.

diff --git a/grml-live b/grml-live
index 4b06507..5001091 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -277,7 +277,6 @@ shift $(($OPTIND - 1))  # set ARGV to the first not parsed commandline parameter
 [ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
 [ -n "$USERNAME" ]         || USERNAME='grml'
 [ -n "$VERSION" ]          || VERSION='0.0.1'
-[ -n "$WINDOWS_BINARIES" ] || WINDOWS_BINARIES='http://the.earth.li/~sgtatham/putty/latest/x86/'
 
 # output specific stuff, depends on $OUTPUT (iff not set):
 [ -n "$OUTPUT" ]           || OUTPUT='/grml/grml-live'
@@ -919,30 +918,6 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
           cp ${TEMPLATE_DIRECTORY}/windows/autostart/* "$BUILD_OUTPUT"/
        fi
 
-       # windows-binaries:
-       if [ -n "$NO_WINDOWS_BINARIES" ] ; then
-          log   "Skipping download of windows binaries as requested via \$NO_WINDOWS_BINARIES."
-          einfo "Skipping download of windows binaries as requested via \$NO_WINDOWS_BINARIES."
-          eend 0
-       else
-          if [ -f "$BUILD_OUTPUT"/windows/putty.exe ] ; then
-             log   "Skipping stage 'WINDOWS_BINARIES' as $BUILD_OUTPUT/windows exists already."
-             ewarn "Skipping stage 'WINDOWS_BINARIES' as $BUILD_OUTPUT/windows exists already." ; eend 0
-          else
-             if ! [ -d "$BUILD_OUTPUT"/windows ] ; then
-                mkdir "$BUILD_OUTPUT"/windows
-                ( cd "$BUILD_OUTPUT"/windows
-                  for file in pageant plink pscp psftp putty puttygen ; do
-                     wget -O ${file}.exe ${WINDOWS_BINARIES}/${file}.exe
-                     md5sum ${file}.exe > ${file}.exe.md5
-                  done )
-             fi
-
-             log "Finished execution of stage 'WINDOWS_BINARIES' [$(date)]"
-             einfo "Finished execution of stage 'WINDOWS_BINARIES'" ; eend 0
-          fi
-       fi
-
     FORCE_ISO_REBUILD=true
     einfo "Finished execution of stage 'boot'" ; eend 0
     fi

diff --git a/templates/GRML/index.html b/templates/GRML/index.html
index 3543dbc..20a5066 100644 (file)
--- a/templates/GRML/index.html
+++ b/templates/GRML/index.html
@@ -97,17 +97,6 @@
 
             <img style="float: right" src="images/linux.jpg" alt="*" />
 
-            <h3>Windows-Software</h3>
-
-            <ul>
-              <li><a href="../windows/pageant.exe">pageant.exe</a> (<a href="../windows/pageant.exe.md5">md5sum</a>)</li>
-              <li><a href="../windows/plink.exe">plink.exe</a> (<a href="../windows/plink.exe.md5">md5sum</a>)</li>
-              <li><a href="../windows/pscp.exe">pscp.exe</a> (<a href="../windows/pscp.exe.md5">md5sum</a>)</li>
-              <li><a href="../windows/psftp.exe">psftp.exe</a> (<a href="../windows/psftp.exe.md5">md5sum</a>)</li>
-              <li><a href="../windows/putty.exe">putty.exe</a> (<a href="../windows/putty.exe.md5">md5sum</a>)</li>
-              <li><a href="../windows/puttygen.exe">puttygen.exe</a> (<a href="../windows/puttygen.exe.md5">md5sum</a>)</li>
-            </ul>
-
             <h3>Notice</h3>
 
             <p>If you want to download and/or use 'grml' you have to accept the