maketgz: Remove unnecessary comment lines, remove dead code.

Signed-off-by: Nils Gillmann <gillmann@gnunet.org>

1 files changed, 11 insertions, 71 deletions

diff --git a/maketgz b/maketgz
index d89310b11..03e4fdb61 100755
--- a/maketgz
+++ b/maketgz
@@ -121,19 +121,12 @@ findprog()
   return 0
 }
 
-############################################################################
-#
 # Enforce a rerun of configure (updates the VERSION)
-#
 
 echo "Re-running config.status"
 ./config.status --recheck >/dev/null
 
-############################################################################
-#
-# automake is needed to run to make a non-GNU Makefile.in if Makefile.am has
-# been modified.
-#
+# automake is needed to run to make a non-GNU Makefile.in if Makefile.am has been modified.
 
 if { findprog automake >/dev/null 2>/dev/null; } then
   echo "- Could not find or run automake, I hope you know what you're doing!"
@@ -142,10 +135,7 @@ else
   automake --include-deps Makefile >/dev/null
 fi
 
-############################################################################
-#
 # Modify the man pages to display the version number and date.
-#
 
 echo "update man pages"
 ./scripts/updatemanpages.pl $version
@@ -153,8 +143,6 @@ echo "update man pages"
 # make the generated file newer than the man page
 touch src/tool_hugehelp.c
 
-############################################################################
-#
 # Update the IDE files
 echo "make vc-ide"
 make -s vc-ide
@@ -162,88 +150,40 @@ make -s vc-ide
 echo "produce CHANGES"
 git log --pretty=fuller --no-color --date=short --decorate=full -1000 | ./scripts/log2changes.pl > CHANGES.dist
 
-############################################################################
-#
-# Revert shebang-patches in ltmain.sh
-#
+# Guix, revert shebang-patches in ltmain.sh
 
 echo "revert shebang patches in ltmain.sh"
 sed -i 's|/gnu/store/[a-z0-9]\{32\}-bash-minimal-4.4.12||' ltmain.sh
 
-############################################################################
-#
 # Now run make dist to generate a tar.gz archive
-#
 
 echo "make dist"
 targz="gnurl-$version.tar.gz"
 make -sj dist VERSION=$version
 
-############################################################################
-#
-# Now make a bz2 archive from the tar.gz original
-#
-#
-#bzip2="gnurl-$version.tar.bz2"
-#echo "Generating $bzip2"
-#gzip -dc $targz | bzip2 --best > $bzip2
-#
-############################################################################
-#
 # Now make an Z archive from the tar.gz original
-#
 
 compress="gnurl-$version.tar.Z"
 tempdir=".builddir"
 
 makeZ() {
- rm -rf $tempdir
- mkdir $tempdir
- cd $tempdir
- tar -xf ../$targz
- tar -cZf $compress gnurl-$version
- mv $compress ../
- cd ..
- rm -rf $tempdir
+    rm -rf $tempdir
+    mkdir $tempdir
+    cd $tempdir
+    tar -xf ../$targz
+    tar -cZf $compress gnurl-$version
+    mv $compress ../
+    cd ..
+    rm -rf $tempdir
 }
 
 echo "Generating $compress"
 makeZ
 
-############################################################################
-#
-# Now make an xz archive from the tar.gz original
-#
-#
-#xz="gnurl-$version.tar.xz"
-#echo "Generating $xz"
-#gzip -dc $targz | xz -6e - > $xz
-#
-############################################################################
-#
-# Now make a zip archive from the tar.gz original
-#
-makezip ()
-{
-  rm -rf $tempdir
-  mkdir $tempdir
-  cd $tempdir
-  gzip -dc ../$targz | tar -xf -
-  find . | zip $zip -@ >/dev/null
-  mv $zip ../
-  cd ..
-  rm -rf $tempdir
-}
-
-zip="gnurl-$version.zip"
-echo "Generating $zip"
-tempdir=".builddir"
-#makezip
-
 echo "------------------"
 echo "maketgz report:"
 echo ""
 ls -l $targz $bzip2 $xz $compress
 
 echo "Run this:"
-echo "gpg -b -a $targz && gpg -b -a $bzip2 && gpg -b -a $zip && gpg -b -a $xz"
+echo "gpg -b -a $targz && gpg -b -a $compress"