Merge branch 'hotfix/resolve-windows-executable'

cmhughes · Jan 18, 2018 · 2440534 · 2440534
2 parents bd8c8fd + a801fd4
commit 2440534
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 19 deletions.
diff --git a/LatexIndent/GetYamlSettings.pm b/LatexIndent/GetYamlSettings.pm
@@ -48,7 +48,7 @@ sub readSettings{
   my $self = shift;
 
   # read the default settings
-  $defaultSettings = YAML::Tiny->read( "$FindBin::RealBin/defaultSettings.yaml" );
+  $defaultSettings = YAML::Tiny->read( "$FindBin::RealBin/defaultSettings.yaml" ) if ( -e "$FindBin::RealBin/defaultSettings.yaml" );
 
   # grab the logger object
   my $logger = get_logger("Document");

diff --git a/LatexIndent/Version.pm b/LatexIndent/Version.pm
@@ -19,6 +19,6 @@ use warnings;
 use Exporter qw/import/;
 our @EXPORT_OK = qw/$versionNumber $versionDate/;
 
-our $versionNumber = '3.4';
-our $versionDate = '2018-01-13';
+our $versionNumber = '3.4.1';
+our $versionDate = '2018-01-18';
 1
diff --git a/defaultSettings.yaml b/defaultSettings.yaml
@@ -1,4 +1,4 @@
-# defaultSettings.yaml for latexindent.pl, version 3.4, 2018-01-13
+# defaultSettings.yaml for latexindent.pl, version 3.4.1, 2018-01-18
 #                      a script that aims to
 #                      beautify .tex, .sty, .cls files
 #

diff --git a/documentation/appendices.tex b/documentation/appendices.tex
@@ -31,7 +31,7 @@
 \end{cmhlistings}
 
 	\subsection{Module installer script}\label{sec:module-installer}
-	    \announce*{2018-01-13}{perl module helper script} \texttt{latexindent.pl} ships with a helper script that will install any missing \texttt{perl} modules
+		\announce*{2018-01-13}{perl module helper script} \texttt{latexindent.pl} ships with a helper script that will install any missing \texttt{perl} modules
 		on your system; if you run
 		\begin{commandshell}
 perl latexindent-module-installer.pl

diff --git a/documentation/readme.txt b/documentation/readme.txt
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    latexindent.pl, version 3.4, 2018-01-13
+    latexindent.pl, version 3.4.1, 2018-01-18
 
     PERL script to indent code within environments, and align delimited 
     environments in .tex files.

diff --git a/documentation/title.tex b/documentation/title.tex
@@ -8,7 +8,7 @@
 			sharp corners,
 			enhanced,
 			overlay={\node[anchor=north east,outer sep=2pt] at ([xshift=3cm,yshift=4mm]frame.north east) {\includegraphics[width=3cm]{logo}}; }]
-		\centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.4
+		\centering\ttfamily\bfseries latexindent.pl\\[1cm] Version 3.4.1
 	\end{tcolorbox}
 }
 \author{Chris Hughes \thanks{and contributors!

diff --git a/helper-scripts/update-version.sh b/helper-scripts/update-version.sh
@@ -1,31 +1,39 @@
 #!/bin/bash
 
 generatePDFmode=0
-while getopts "p" OPTION
+minorVersion=0
+while getopts "mp" OPTION
 do
  case $OPTION in 
   p)    
    echo "re-generating pdf..."
    generatePDFmode=1
    ;;
+  m)    
+   echo "minor version, not removing most recently updated stars from documentation..."
+   minorVersion=1
+   ;;
   ?)    printf "Usage: %s: [-s]  args\n" $(basename $0) >&2
         exit 2
         ;;
  # end case
  esac 
 done
 
-oldVersion='3.3'
-newVersion='3.4'
-oldDate='2017-08-21'
-newDate='2018-01-13'
+oldVersion='3.4'
+newVersion='3.4.1'
+oldDate='2018-01-13'
+newDate='2018-01-18'
 
 cd ../
-cd documentation
-find -name "s*.tex" -print0|xargs -0 sed -i.bak -E "s/announce\*\{/announce\{/g"
-find -name "s*.tex" -print0|xargs -0 sed -i.bak -E "s/announce\{NEW\}/announce\*\{$newDate\}/gi"
-find -name "a*.tex" -print0|xargs -0 sed -i.bak -E "s/announce\{NEW\}/announce\*\{$newDate\}/gi"
-cd ../
+if [ minorVersion == 0 ]
+then
+    cd documentation
+    find -name "s*.tex" -print0|xargs -0 sed -i.bak -E "s/announce\*\{/announce\{/g"
+    find -name "s*.tex" -print0|xargs -0 sed -i.bak -E "s/announce\{NEW\}/announce\*\{$newDate\}/gi"
+    find -name "a*.tex" -print0|xargs -0 sed -i.bak -E "s/announce\{NEW\}/announce\*\{$newDate\}/gi"
+    cd ../
+fi
 sed -i.bak "s/\$versionNumber = '$oldVersion'/\$versionNumber = '$newVersion'/" LatexIndent/Version.pm
 sed -i.bak "s/\$versionDate = '$oldDate'/\$versionDate = '$newDate'/" LatexIndent/Version.pm
 sed -i.bak "s/version $oldVersion, $oldDate/version $newVersion, $newDate/" latexindent.pl

diff --git a/latexindent.exe b/latexindent.exe
diff --git a/latexindent.pl b/latexindent.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-#   latexindent.pl, version 3.4, 2018-01-13
+#   latexindent.pl, version 3.4.1, 2018-01-18
 #
 #	This program is free software: you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by

diff --git a/readme.md b/readme.md
@@ -6,7 +6,7 @@ code within environments, commands, after headings and within special code block
 It has the ability to align delimiters in environments and commands, and 
 can modify line breaks.
 
-    latexindent.pl, version 3.4, 2018-01-13
+    latexindent.pl, version 3.4.1, 2018-01-18
 
 ### author 
 Chris Hughes (cmhughes)