From 108fe635ece7fa1b1b63d31d18561418f315b63e Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Thu, 30 Jan 2020 10:44:35 -0700
Subject: [PATCH] updated urls; fixed jenkins-R-dist.sh

---
 R/DESCRIPTION.in        |  2 +-
 R/phreeqc/inst/CITATION |  4 ++--
 jenkins-R-dist.sh       | 12 ++++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 jenkins-R-dist.sh

diff --git a/R/DESCRIPTION.in b/R/DESCRIPTION.in
index ebd34d07..1d201347 100644
--- a/R/DESCRIPTION.in
+++ b/R/DESCRIPTION.in
@@ -8,7 +8,7 @@ Depends:
 Author: S.R. Charlton, D.L. Parkhurst, and C.A.J. Appelo, with contributions  
     from D. Gillespie for Chipmunk BASIC and S.D. Cohen, A.C. Hindmarsh,  
     R. Serban, D. Shumaker, and A.G. Taylor for CVODE/SUNDIALS
-URL: http://wwwbrr.cr.usgs.gov/projects/GWC_coupled/phreeqc
+URL: https://www.usgs.gov/software/phreeqc-version-3
 Description: A geochemical modeling program developed by the US Geological
     Survey that is designed to perform a wide variety of aqueous geochemical
     calculations, including speciation, batch-reaction, one-dimensional 
diff --git a/R/phreeqc/inst/CITATION b/R/phreeqc/inst/CITATION
index 2896c47d..3f826dae 100644
--- a/R/phreeqc/inst/CITATION
+++ b/R/phreeqc/inst/CITATION
@@ -11,7 +11,7 @@ citEntry(entry="Manual",
          volume       = "book 6",
          chapter      = "A43",
          pages        = "497",
-         url          = "http://pubs.usgs.gov/tm/06/a43",
+         url          = "https://pubs.usgs.gov/tm/06/a43",
 
 	 textVersion  =
          paste("Parkhurst, D.L., and Appelo, C.A.J., 2013, Description of",
@@ -20,7 +20,7 @@ citEntry(entry="Manual",
                "transport, and inverse geochemical calculations: U.S.",
                "Geological Survey Techniques and Methods, book 6, chap.",
                "A43, 497 p., available only at",
-               "http://pubs.usgs.gov/tm/06/a43.")
+               "https://pubs.usgs.gov/tm/06/a43.")
 )
 
 
diff --git a/jenkins-R-dist.sh b/jenkins-R-dist.sh
old mode 100644
new mode 100755
index 137463cb..e0e5a480
--- a/jenkins-R-dist.sh
+++ b/jenkins-R-dist.sh
@@ -15,15 +15,19 @@ if [ -z "$VER" ]; then
  VER="${ver_major}.${ver_minor}.${ver_patch}"
 fi
 if [ "$REL" = 'HEAD' ]; then
- HEAD=`svn st -v configure.ac | awk '{print $1}')`
+ HEAD=13021
  REL="$HEAD"
 fi
+if [ -z "$REL" ]; then
+ REL=13021
+fi
 export VER
 # sed files
 /bin/sh jenkins-dist.sh -v ${VER} -r ${REL} -d ${DATE} -pr ${TAG}
 cd R
+mkdir -p phreeqc/man
+mkdir -p phreeqc/src/phreeqcpp
+mkdir -p phreeqc/R
+mkdir -p phreeqc/data
 make VERSION=${VER} RELEASE_DATE=${DATE} build
 make VERSION=${VER} RELEASE_DATE=${DATE} check
-
-
-