From 6de8bedffd8a7eda2d6041abaa21fb5d88b2856b Mon Sep 17 00:00:00 2001 From: "Achim D. Brucker" Date: Mon, 12 Aug 2019 19:21:09 +0100 Subject: [PATCH 1/4] Fixed help message. --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install b/install index 1126eb1..ac9cb5e 100755 --- a/install +++ b/install @@ -35,7 +35,7 @@ source .config print_help() { - echo "Usage: $PROG [OPTION] " + echo "Usage: install [OPTION] " echo "" echo "Run ..." echo "" From 257af672049cacb403411b79e24fa57c6b726bca Mon Sep 17 00:00:00 2001 From: "Achim D. Brucker" Date: Mon, 12 Aug 2019 19:23:58 +0100 Subject: [PATCH 2/4] Avoid using newlines, seem to cause problems on an unnamed OS from Cupertino. --- install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install b/install index ac9cb5e..bbbba4f 100755 --- a/install +++ b/install @@ -209,11 +209,11 @@ install_and_register(){ ISABELLE_SHORT_VERSION=`echo $ISABELLE_VERSION | sed -e 's/^Isabelle\(.*\):.*/\1/'` sed -i -e "s|%%% CONFIG %%%| \ - \\\\renewcommand{\\\\dof@isabelleversion}{$ISABELLE_SHORT_VERSION}\n \ - \\\\renewcommand{\\\\isabellefullversion}{$ISABELLE_VERSION\\\\xspace}\n \ - \\\\renewcommand{\\\\dof@version}{$DOF_VERSION}\n \ - \\\\renewcommand{\\\\isabelleurl}{$ISABELLE_URL}\n \ - \\\\renewcommand{\\\\dofurl}{$DOF_URL}\n \ + \\\\renewcommand{\\\\dof@isabelleversion}{$ISABELLE_SHORT_VERSION} \ + \\\\renewcommand{\\\\isabellefullversion}{$ISABELLE_VERSION\\\\xspace} \ + \\\\renewcommand{\\\\dof@version}{$DOF_VERSION} \ + \\\\renewcommand{\\\\isabelleurl}{$ISABELLE_URL} \ + \\\\renewcommand{\\\\dofurl}{$DOF_URL} \ \\\\renewcommand{\\\\dof@artifacturl}{$DOF_ARTIFACT_URL}|" \ "$DIR/DOF-core.sty" From 9183dea32a5c225c3f8fd57bf7f9e744d426cdc7 Mon Sep 17 00:00:00 2001 From: "Achim D. Brucker" Date: Mon, 12 Aug 2019 19:37:54 +0100 Subject: [PATCH 3/4] Splitting artifact URL. --- .config | 3 ++- install | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.config b/.config index 155bc71..b4452b0 100644 --- a/.config +++ b/.config @@ -2,6 +2,7 @@ DOF_VERSION="Unreleased" ISABELLE_VERSION="Isabelle2019: June 2019" ISABELLE_URL="https://isabelle.in.tum.de/website-Isabelle2019/" DOF_URL="https://git.logicalhacking.com/Isabelle_DOF/Isabelle_DOF" -DOF_ARTIFACT_URL="https://artifacts.logicalhacking.com/releases/Isabelle_DOF/Isabelle_DOF" +DOF_ARTIFACT_DIR="releases/Isabelle_DOF/Isabelle_DOF" +DOF_ARTIFACT_HOST="artifacts.logicalhacking.com" AFP_DATE="afp-2019-06-17" AFP_URL="https://www.isa-afp.org/release/"$AFP_DATE".tar.gz" diff --git a/install b/install index bbbba4f..8ee0660 100755 --- a/install +++ b/install @@ -214,7 +214,7 @@ install_and_register(){ \\\\renewcommand{\\\\dof@version}{$DOF_VERSION} \ \\\\renewcommand{\\\\isabelleurl}{$ISABELLE_URL} \ \\\\renewcommand{\\\\dofurl}{$DOF_URL} \ - \\\\renewcommand{\\\\dof@artifacturl}{$DOF_ARTIFACT_URL}|" \ + \\\\renewcommand{\\\\dof@artifacturl}{https://$DOF_ARTIFACT_HOST/$DOF_ARTIFACT_DIR}|" \ "$DIR/DOF-core.sty" DIR="$ISABELLE_HOME_USER/DOF/latex" From af031a26780fe29e0515d519a1a69b3345b2f841 Mon Sep 17 00:00:00 2001 From: "Achim D. Brucker" Date: Mon, 12 Aug 2019 19:38:31 +0100 Subject: [PATCH 4/4] Include Isabelle prefix in short version. --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install b/install index 8ee0660..3133b5f 100755 --- a/install +++ b/install @@ -207,7 +207,7 @@ install_and_register(){ cp $GEN_DIR/document-templates/* "$DIR" cp $GEN_DIR/DOF/*/*.sty "$DIR" - ISABELLE_SHORT_VERSION=`echo $ISABELLE_VERSION | sed -e 's/^Isabelle\(.*\):.*/\1/'` + ISABELLE_SHORT_VERSION=`echo $ISABELLE_VERSION | sed -e 's/:.*$//'` sed -i -e "s|%%% CONFIG %%%| \ \\\\renewcommand{\\\\dof@isabelleversion}{$ISABELLE_SHORT_VERSION} \ \\\\renewcommand{\\\\isabellefullversion}{$ISABELLE_VERSION\\\\xspace} \