diff options
| author | B Stack <bgstack15@gmail.com> | 2017-05-20 17:39:03 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2017-05-20 17:39:03 -0400 |
| commit | 6cd24f0b3fcecf2e0a28c0baaad7aff0d882b02a (patch) | |
| tree | e407f6d5ad70a7df82c08fabf18d9228af0ed8a2 /usr | |
| parent | updated icons for deb, rpm, and repo (diff) | |
| download | mirror-6cd24f0b3fcecf2e0a28c0baaad7aff0d882b02a.tar.gz mirror-6cd24f0b3fcecf2e0a28c0baaad7aff0d882b02a.tar.bz2 mirror-6cd24f0b3fcecf2e0a28c0baaad7aff0d882b02a.zip | |
fixed deploy.sh minor error message
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/share/mirror/deploy.sh | 10 | ||||
| -rw-r--r-- | usr/share/mirror/docs/README.txt | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/usr/share/mirror/deploy.sh b/usr/share/mirror/deploy.sh index a218d39..2e7adba 100755 --- a/usr/share/mirror/deploy.sh +++ b/usr/share/mirror/deploy.sh @@ -6,7 +6,8 @@ # Purpose: To make it easy to deploy to the mirror a new version of a package # Package: mirror # History: -# 2017-02-06 added --noupdate option +# 2017-02-06 Added --noupdate option +# 2017-05-20 Added debugging info for thispackagedir. Also displays better error message when skipping source file for a zone due to its absence. # Usage: # Reference: ftemplate.sh 2016-07-12a; framework.sh 2016-05-25a # mirror-master from mirror-1.0-2.noarch.rpm @@ -213,7 +214,8 @@ do line=$( echo "${line}" | sed -e 's/^\s*//;s/\s*$//;/^[#$]/d;s/\s*[^\]#.*$//;' do [[ ! "${thiszone}" = "input" ]] && { debuglev 5 && ferror "Running ${thiszone}" - eval thislocation=\${${thiszone}location} + #eval thislocation=\${${thiszone}location} + eval eval thislocation=\${${thiszone}location}; location="${thislocation}" if [[ -z "${thislocation}" ]] || [[ ! -d "${thislocation}" ]]; then continue; fi # so the location exists @@ -222,6 +224,8 @@ do line=$( echo "${line}" | sed -e 's/^\s*//;s/\s*$//;/^[#$]/d;s/\s*[^\]#.*$//;' # DERIVE PACKAGE SOURCE FILE eval thisflavor=\${${thiszone}flavor} eval thispackagedir=\${${thiszone}packagedir} + eval eval thispackagedir=\${${thiszone}packagedir} + debuglev 5 && ferror "thispackagedir=${thispackagedir}" [[ -n "${thispackagedir}" ]] && eval thispackagedir="${thispackagedir}" case "${thisflavor}" in redhat|centos) # needs special attention to get architecture @@ -250,7 +254,7 @@ do line=$( echo "${line}" | sed -e 's/^\s*//;s/\s*$//;/^[#$]/d;s/\s*[^\]#.*$//;' # PERFORM FILE COPY if [[ ! -f "${sourcefile}" ]]; then - ferror "Skipped ${thiszone} source ${sourcefile}: not found." + ferror "Skipped ${thiszone} source for ${thispackage}: not found." else fileaction copy "${sourcefile}" "${destinationfile}" thiszoneused=1 diff --git a/usr/share/mirror/docs/README.txt b/usr/share/mirror/docs/README.txt index d9ee626..534583f 100644 --- a/usr/share/mirror/docs/README.txt +++ b/usr/share/mirror/docs/README.txt @@ -120,4 +120,5 @@ Fixed deploy.conf to point to /srv/science for everything Changed deploy.conf to use package directories for deployment 2017-05-20 mirror-1.1-4 -- Adapted new icons for rpm, deb, and repos +- Adapted new icons for rpm, deb, and repos. +- Updated directories for storage1 in the Mersey network. |