multicd.sh/multicd.sh.patch

   1 --- multicd.sh  2010-03-07 05:07:43.000000000 +0100
   2 +++ multicd.sh.new      2010-03-12 17:46:27.846371785 +0100
   3 @@ -32,6 +32,17 @@
   4  if [ -d tags ];then rm -r tags;fi
   5  mkdir -p tags/puppies
   6
   7 +# We copy the default plugins to the local working directory
   8 +# if no plugins folder exists. If a plugin folder exists
   9 +# we also copy the default plugins there but not overwriting
  10 +# any already existing ones.
  11 +if [ -d plugins ];then
  12 +       cp -rn /usr/share/multicd.sh/plugins/* plugins/
  13 +else
  14 +       echo "Copying default plugins to local older"
  15 +       cp -r /usr/share/multicd.sh/plugins .
  16 +fi
  17 +
  18  if echo $* | grep -q "\bmd5\b";then
  19   MD5=1
  20  else
  21 @@ -178,29 +189,14 @@
  22   cp grub.exe multicd-working/boot/grub.exe
  23  fi
  24
  25 -echo "Downloading SYSLINUX..."
  26 -if [ -f syslinux.tar.gz ];then
  27 -       cp syslinux.tar.gz /tmp/syslinux.tar.gz
  28 -else
  29 -       if [ $VERBOSE != 0 ];then
  30 -               wget -O /tmp/syslinux.tar.gz ftp://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-*.tar.gz
  31 -       else
  32 -               wget -qO /tmp/syslinux.tar.gz ftp://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-*.tar.gz
  33 -       fi
  34 -fi
  35 -if [ $? = 0 ];then
  36 -       echo "Unpacking and copying files..."
  37 -       tar -C /tmp -xzf /tmp/syslinux.tar.gz
  38 -       cp /tmp/syslinux-*/core/isolinux.bin multicd-working/boot/isolinux/
  39 -       cp /tmp/syslinux-*/memdisk/memdisk multicd-working/boot/isolinux/
  40 -       cp /tmp/syslinux-*/com32/menu/menu.c32 multicd-working/boot/isolinux/
  41 -       cp /tmp/syslinux-*/com32/menu/vesamenu.c32 multicd-working/boot/isolinux/
  42 -       cp /tmp/syslinux-*/com32/modules/chain.c32 multicd-working/boot/isolinux/
  43 -       rm -r /tmp/syslinux-*/ /tmp/syslinux.tar.gz
  44 -else
  45 -       echo "Downloading of SYSLINUX failed."
  46 -       exit 1
  47 -fi
  48 +# We take the isolinux and memdisk stuff from the repo
  49 +echo "Copying SYSLINUX..."
  50 +SYSLINUX_PATH=/usr/lib/syslinux
  51 +cp $SYSLINUX_PATH/isolinux.bin multicd-working/boot/isolinux/
  52 +cp $SYSLINUX_PATH/memdisk multicd-working/boot/isolinux/
  53 +cp $SYSLINUX_PATH/menu.c32 multicd-working/boot/isolinux/
  54 +cp $SYSLINUX_PATH/vesamenu.c32 multicd-working/boot/isolinux/
  55 +cp $SYSLINUX_PATH/chain.c32 multicd-working/boot/isolinux/
  56
  57  if [ $MEMTEST = 1 ];then
  58   if [ -f memtest ];then