Merge branch 'main' of github.com:caltechlibrary/irdmtools into gh-pages

caltechlibrary · Jul 10, 2024 · 4b2dc0d · 4b2dc0d
2 parents 40c09f4 + 9dba678
commit 4b2dc0d
Show file tree

Hide file tree

Showing 27 changed files with 44 additions and 28 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -14,7 +14,7 @@ authors:
 
 
 repository-code: "https://github.com/caltechlibrary/irdmtools"
-version: 0.0.83
+version: 0.0.84
 license-url: "https://caltechlibrary.github.io/irdmtools/LICENSE"
 keywords: [ "institutional repository", "data
 management", "Invenio", "Invenio-RDM" ]
diff --git a/Makefile b/Makefile
@@ -78,7 +78,7 @@ installer.sh: .FORCE
 <<<<<<< HEAD
 =======
 installer.ps1: .FORCE
-	@echo '' | pandoc --metadata title="Installer" --metadata git_org_or_person="$(GIT_GROUP)" --metadata-file codemeta.json --template codemeta-ps1-installer.tmpl >installer.ps1
+	@echo '' | pandoc --metadata title="Powershell Installer" --metadata git_org_or_person="$(GIT_GROUP)" --metadata-file codemeta.json --template codemeta-ps1-installer.tmpl >installer.ps1
 	@chmod 775 installer.ps1
 	@git add -f installer.ps1
 

diff --git a/about.html b/about.html
@@ -24,7 +24,7 @@
 
 <section>
 <h1 id="about-this-software">About this software</h1>
-<h2 id="irdmtools-0.0.83">irdmtools 0.0.83</h2>
+<h2 id="irdmtools-0.0.84">irdmtools 0.0.84</h2>
 <h3 id="authors">Authors</h3>
 <ul>
 <li>R. S. Doiel</li>

diff --git a/about.md b/about.md
@@ -14,7 +14,7 @@ authors:
     orcid: "https://orcid.org/0000-0001-9266-5146"
 
 repository-code: "https://github.com/caltechlibrary/irdmtools"
-version: 0.0.83
+version: 0.0.84
 license-url: "https://caltechlibrary.github.io/irdmtools/LICENSE"
 keywords: [ "institutional repository", "data
 management", "Invenio", "Invenio-RDM" ]
@@ -24,7 +24,7 @@ management", "Invenio", "Invenio-RDM" ]
 About this software
 ===================
 
-## irdmtools 0.0.83
+## irdmtools 0.0.84
 
 ### Authors
 

diff --git a/codemeta-bash-installer.tmpl b/codemeta-bash-installer.tmpl
@@ -27,15 +27,16 @@ case "$$OS_NAME" in
    ;;
 esac
 
+if [ "$$1" != "" ]; then
+   VERSION="$$1"
+fi
+
 ZIPFILE="$$PACKAGE-v$$VERSION-$$OS_NAME-$$MACHINE.zip"
 
 #
 # Check to see if this zip file has been downloaded.
 #
 DOWNLOAD_URL="https://github.com/$$GIT_GROUP/$$PACKAGE/releases/download/v$$VERSION/$$ZIPFILE"
-if [ ! -d "$$HOME/Downloads" ]; then
-	mkdir -p "$$HOME/Downloads"
-fi
 if ! curl -L -o "$$HOME/Downloads/$$ZIPFILE" "$$DOWNLOAD_URL"; then
 	echo "Curl failed to get $$DOWNLOAD_URL"
 fi
@@ -46,6 +47,9 @@ cat<<EOT
 
 EOT
 
+if [ ! -d "$$HOME/Downloads" ]; then
+	mkdir -p "$$HOME/Downloads"
+fi
 if [ ! -f "$$HOME/Downloads/$$ZIPFILE" ]; then
 	cat<<EOT
 

diff --git a/codemeta-ps1-installer.tmpl b/codemeta-ps1-installer.tmpl
@@ -4,8 +4,11 @@
 #
 # Set the package name and version to install
 #
+param(
+  [Parameter()]
+  [String]$$VERSION = "$version$"
+)
 $$PACKAGE = "$name$"
-$$VERSION = "$version$"
 $$GIT_GROUP = "$git_org_or_person$"
 $$RELEASE = "https://github.com/$${GIT_GROUP}/$${PACKAGE}/releases/tag/v$${VERSION}"
 $$SYSTEM_TYPE = Get-ComputerInfo -Property CsSystemType
@@ -15,6 +18,7 @@ if ($$SYSTEM_TYPE.CsSystemType.Contains("ARM64")) {
     $$MACHINE = "x86_64"
 }
 
+
 # FIGURE OUT Install directory
 $$BIN_DIR = "$${Home}\bin"
 Write-Output "$${PACKAGE} will be installed in $${BIN_DIR}"

diff --git a/codemeta.json b/codemeta.json
@@ -5,10 +5,10 @@
     "codeRepository": "https://github.com/caltechlibrary/irdmtools",
     "dateCreated": "2022-10-27",
 	"dateRelease": "2024-01-24",
-	"dateModified": "2024-06-10",
+	"dateModified": "2024-07-10",
     "issueTracker": "https://github.com/caltechlibrary/irdmtools/issues",
     "name": "irdmtools",
-    "version": "0.0.83",
+    "version": "0.0.84",
     "description": "Tools for working with institutional repositories and data management systems. Current implementation targets Invenio-RDM.",
     "applicationCategory": "library science",
     "releaseNotes": "Proof of concept and refinements, piloting in production, bug fixes, performance improvements",

diff --git a/doi2rdm.1.md b/doi2rdm.1.md
@@ -1,4 +1,4 @@
-%doi2rdm(1) irdmtools user manual | version 0.0.83 40efc058
+%doi2rdm(1) irdmtools user manual | version 0.0.84 bf112b8a
 % R. S. Doiel and Tom Morrell
 % 2024-07-10
 

diff --git a/ep3ds2citations.1.md b/ep3ds2citations.1.md
@@ -1,4 +1,4 @@
-%ep3ds2citations(1) irdmtools user manual | version 0.0.83 40efc058
+%ep3ds2citations(1) irdmtools user manual | version 0.0.84 bf112b8a
 % R. S. Doiel and Tom Morrell
 % 2024-07-10
 

diff --git a/ep3util.1.md b/ep3util.1.md
@@ -1,4 +1,4 @@
-%ep3util(1) irdmtools user manual | version 0.0.83 40efc058
+%ep3util(1) irdmtools user manual | version 0.0.84 bf112b8a
 % R. S. Doiel and Tom Morrell
 % 2024-07-10
 

diff --git a/eprint2rdm.1.md b/eprint2rdm.1.md
@@ -1,4 +1,4 @@
-%eprint2rdm(1) irdmtools user manual | version 0.0.83 40efc058
+%eprint2rdm(1) irdmtools user manual | version 0.0.84 bf112b8a
 % R. S. Doiel and Tom Morrell
 % 2024-07-10
 

diff --git a/eprintrest.1.md b/eprintrest.1.md
@@ -1,4 +1,4 @@
-%eprintrest(1) irdmtools user manual | version 0.0.83 40efc058
+%eprintrest(1) irdmtools user manual | version 0.0.84 bf112b8a
 % R. S. Doiel and Tom Morrell
 % 2024-07-10
 

diff --git a/installer.ps1 b/installer.ps1
@@ -4,8 +4,11 @@
 #
 # Set the package name and version to install
 #
+param(
+  [Parameter()]
+  [String]$VERSION = "0.0.84"
+)
 $PACKAGE = "irdmtools"
-$VERSION = "0.0.83"
 $GIT_GROUP = "caltechlibrary"
 $RELEASE = "https://github.com/${GIT_GROUP}/${PACKAGE}/releases/tag/v${VERSION}"
 $SYSTEM_TYPE = Get-ComputerInfo -Property CsSystemType
@@ -15,6 +18,7 @@ if ($SYSTEM_TYPE.CsSystemType.Contains("ARM64")) {
     $MACHINE = "x86_64"
 }
 
+
 # FIGURE OUT Install directory
 $BIN_DIR = "${Home}\bin"
 Write-Output "${PACKAGE} will be installed in ${BIN_DIR}"

diff --git a/installer.sh b/installer.sh
@@ -4,7 +4,7 @@
 # Set the package name and version to install
 #
 PACKAGE="irdmtools"
-VERSION="0.0.83"
+VERSION="0.0.84"
 GIT_GROUP="caltechlibrary"
 RELEASE="https://github.com/$GIT_GROUP/$PACKAGE/releases/tag/v$VERSION"
 
@@ -27,15 +27,16 @@ case "$OS_NAME" in
    ;;
 esac
 
+if [ "$1" != "" ]; then
+   VERSION="$1"
+fi
+
 ZIPFILE="$PACKAGE-v$VERSION-$OS_NAME-$MACHINE.zip"
 
 #
 # Check to see if this zip file has been downloaded.
 #
 DOWNLOAD_URL="https://github.com/$GIT_GROUP/$PACKAGE/releases/download/v$VERSION/$ZIPFILE"
-if [ ! -d "$HOME/Downloads" ]; then
-	mkdir -p "$HOME/Downloads"
-fi
 if ! curl -L -o "$HOME/Downloads/$ZIPFILE" "$DOWNLOAD_URL"; then
 	echo "Curl failed to get $DOWNLOAD_URL"
 fi
@@ -46,6 +47,9 @@ cat<<EOT
 
 EOT
 
+if [ ! -d "$HOME/Downloads" ]; then
+	mkdir -p "$HOME/Downloads"
+fi
 if [ ! -f "$HOME/Downloads/$ZIPFILE" ]; then
 	cat<<EOT
 

diff --git a/pagefind/fragment/unknown_10b7cab.pf_fragment b/pagefind/fragment/unknown_10b7cab.pf_fragment
diff --git a/pagefind/fragment/unknown_c4c12ca.pf_fragment b/pagefind/fragment/unknown_c4c12ca.pf_fragment
diff --git a/pagefind/fragment/unknown_d7a39ec.pf_fragment b/pagefind/fragment/unknown_d7a39ec.pf_fragment
diff --git a/pagefind/index/unknown_9cb781b.pf_index b/pagefind/index/unknown_9cb781b.pf_index
diff --git a/pagefind/index/unknown_d745624.pf_index b/pagefind/index/unknown_d745624.pf_index
diff --git a/pagefind/pagefind-entry.json b/pagefind/pagefind-entry.json
@@ -1 +1 @@
-{"version":"1.1.0","languages":{"unknown":{"hash":"unknown_5fd3512958e04f4","wasm":null,"page_count":23}}}
+{"version":"1.1.0","languages":{"unknown":{"hash":"unknown_2b124eacd218176","wasm":null,"page_count":23}}}
diff --git a/pagefind/pagefind.unknown_2b124eacd218176.pf_meta b/pagefind/pagefind.unknown_2b124eacd218176.pf_meta
diff --git a/pagefind/pagefind.unknown_af1e97678b478f7.pf_meta b/pagefind/pagefind.unknown_af1e97678b478f7.pf_meta
diff --git a/people2vocabulary.1.md b/people2vocabulary.1.md
@@ -1,4 +1,4 @@
-%people2vocabulary(1) irdmtools user manual | version 0.0.83 40efc058
+%people2vocabulary(1) irdmtools user manual | version 0.0.84 bf112b8a
 % R. S. Doiel
 % 2024-07-10
 

diff --git a/rdm2eprint.1.md b/rdm2eprint.1.md
@@ -1,4 +1,4 @@
-%rdm2eprint(1) irdmtools user manual | version 0.0.83 40efc058
+%rdm2eprint(1) irdmtools user manual | version 0.0.84 bf112b8a
 % R. S. Doiel and Tom Morrell
 % 2024-07-10
 

diff --git a/rdmds2citations.1.md b/rdmds2citations.1.md
@@ -1,4 +1,4 @@
-%rdmds2citations(1) irdmtools user manual | version 0.0.83 40efc058
+%rdmds2citations(1) irdmtools user manual | version 0.0.84 bf112b8a
 % R. S. Doiel and Tom Morrell
 % 2024-07-10
 

diff --git a/rdmutil.1.md b/rdmutil.1.md
@@ -1,4 +1,4 @@
-%rdmutil(1) irdmtools user manual | version 0.0.83 40efc058
+%rdmutil(1) irdmtools user manual | version 0.0.84 bf112b8a
 % R. S. Doiel and Tom Morrell
 % 2024-07-10
 

diff --git a/version.go b/version.go
@@ -6,13 +6,13 @@ import (
 
 const (
     // Version number of release
-    Version = "0.0.83"
+    Version = "0.0.84"
 
     // ReleaseDate, the date version.go was generated
     ReleaseDate = "2024-07-10"
 
     // ReleaseHash, the Git hash when version.go was generated
-    ReleaseHash = "40efc058"
+    ReleaseHash = "bf112b8a"
 
     LicenseText = `
 Redistribution and use in source and binary forms, with or without
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"version":"1.1.0","languages":{"unknown":{"hash":"unknown_5fd3512958e04f4","wasm":null,"page_count":23}}}
		{"version":"1.1.0","languages":{"unknown":{"hash":"unknown_2b124eacd218176","wasm":null,"page_count":23}}}