diff options
| -rwxr-xr-x | etc/mirror/inc/deploy.sh | 14 | ||||
| -rwxr-xr-x | etc/mirror/mirror-master.sh | 4 |
2 files changed, 4 insertions, 14 deletions
diff --git a/etc/mirror/inc/deploy.sh b/etc/mirror/inc/deploy.sh index b5668e0..c306ac5 100755 --- a/etc/mirror/inc/deploy.sh +++ b/etc/mirror/inc/deploy.sh @@ -98,20 +98,8 @@ function parseFlag { # DETERMINE LOCATION OF FRAMEWORK while read flocation; do if [[ -x $flocation ]] && [[ $( $flocation --fcheck ) -ge 20160229 ]]; then frameworkscript=$flocation; break; fi; done <<EOFLOCATIONS ./framework.sh -${scriptdir}/framework.sh -~/bin/bgscripts/framework.sh -~/bin/framework.sh -~/bgscripts/framework.sh -~/framework.sh -/usr/local/bin/bgscripts/framework.sh -/usr/local/bin/framework.sh -/usr/bin/bgscripts/framework.sh -/usr/bin/framework.sh /usr/bgscripts/framework.sh -/usr/framework.sh -/bin/bgscripts/framework.sh -/bin/framework.sh -/mnt/scripts/bgscripts/framework.sh +/usr/share/bgscripts/framework.sh EOFLOCATIONS [[ -z "$frameworkscript" ]] && echo "$0: framework not found. Aborted." 1>&2 && exit 4 diff --git a/etc/mirror/mirror-master.sh b/etc/mirror/mirror-master.sh index 351574f..8cf0d3b 100755 --- a/etc/mirror/mirror-master.sh +++ b/etc/mirror/mirror-master.sh @@ -9,12 +9,13 @@ # History: # 2016-01-07 Fixed logic for detecting already-running instance # 2016-06-08 Modified to use mirror.conf config file, for mirror-1.0-2 +# 2017-01-11 Updated new location for framework # Usage: Call in cron every day # Reference: ftemplate.sh 2015-11-23a; framework.sh 2015-11-23a # mirror.auser1 (2014-11-11) # Improve: fiversion="2015-11-23a" -mirrormasterversion="2016-06-08a" +mirrormasterversion="2017-01-11a" usage() { less -F >&2 <<ENDUSAGE @@ -83,6 +84,7 @@ function parseFlag { while read flocation; do if [[ -x $flocation ]] && [[ $( $flocation --fcheck ) -ge 20160525 ]]; then frameworkscript=$flocation; break; fi; done <<EOFLOCATIONS ./framework.sh /usr/bgscripts/framework.sh +/usr/share/bgscripts/framework.sh EOFLOCATIONS [[ -z "$frameworkscript" ]] && echo "$0: framework not found. Aborted." 1>&2 && exit 4 |