had scripts point to new location for rsync helper script; ver 1.0-9

15 files changed, 19 insertions, 15 deletions

diff --git a/usr/share/mirror/docs/README.txt b/usr/share/mirror/docs/README.txt
index ef5ddbf..85afdae 100644
--- a/usr/share/mirror/docs/README.txt
+++ b/usr/share/mirror/docs/README.txt
@@ -1,5 +1,5 @@
 File: etc/mirror/README.txt
-Package: mirror 1.0-8
+Package: mirror 1.0-9
 Author: bgstack15@gmail.com
 Startdate: 2016-06-08
 Title: Readme file for mirror
@@ -95,3 +95,7 @@ Added deploy.sh --noupdate option
 Fixed mirror.conf to point to correct directory of /usr/share/mirror/scripts
 Added contents of /usr/share/mirror/scripts as %config directives in ./pack spec instructions
 Moved httpd/sites contents to /usr/share/mirror/examples/sites so it will not overwrite any existing files. These are just examples and should be deployed manually.
+Fixed dependency to bgscripts-core
+
+2017-02-08 mirror-1.0-9
+Updated scripts to use /usr/share/mirror/inc/rsync script
diff --git a/usr/share/mirror/docs/mirror.spec b/usr/share/mirror/docs/mirror.spec
index a7aa389..b6404cb 100644
--- a/usr/share/mirror/docs/mirror.spec
+++ b/usr/share/mirror/docs/mirror.spec
@@ -1,7 +1,7 @@
 Summary: Mirror
 Name: mirror
 Version: 1.0
-Release: 8
+Release: 9
 License: CC BY-SA 4.0
 Group: Applications/System
 Source: mirror.tgz
diff --git a/usr/share/mirror/inc/localize_git.sh b/usr/share/mirror/inc/localize_git.sh
index 6ac5525..abf997a 100755
--- a/usr/share/mirror/inc/localize_git.sh
+++ b/usr/share/mirror/inc/localize_git.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-\cp -pRf /home/work/mirror.clean/.git /home/bgstack15/rpmbuild/SOURCES/mirror-1.0-8/
+\cp -pRf /home/work/mirror.clean/.git /home/bgstack15/rpmbuild/SOURCES/mirror-1.0-9/
diff --git a/usr/share/mirror/inc/scrub.txt b/usr/share/mirror/inc/scrub.txt
index caee809..72d4e35 100644
--- a/usr/share/mirror/inc/scrub.txt
+++ b/usr/share/mirror/inc/scrub.txt
@@ -1,5 +1,5 @@
 # for scrubpy version 2016-11-16a or newer
-source /home/bgstack15/rpmbuild/SOURCES/mirror-1.0-8
+source /home/bgstack15/rpmbuild/SOURCES/mirror-1.0-9
 target /home/work/mirror.clean
 ignore "tgz png gif jpg pyc pyo git swp ico"
 # rest of the lines are "OLD WORD" "NEW WORD"
diff --git a/usr/share/mirror/scripts/centos b/usr/share/mirror/scripts/centos
index b812bde..0254b70 100755
--- a/usr/share/mirror/scripts/centos
+++ b/usr/share/mirror/scripts/centos
@@ -2,6 +2,6 @@
 # File: /etc/mirror/scripts/centos
 # ftp://mirror.nandomedia.com/pub/CentOS/
 
-source /etc/mirror/inc/rsync
+source /usr/share/mirror/inc/rsync
 
 rmirror mirrors.kernel.org::centos centos '[234]*/' 'alpha/' 's390*/' 'ia64/'
diff --git a/usr/share/mirror/scripts/fedora-epel b/usr/share/mirror/scripts/fedora-epel
index 88f0c77..0c65042 100755
--- a/usr/share/mirror/scripts/fedora-epel
+++ b/usr/share/mirror/scripts/fedora-epel
@@ -2,6 +2,6 @@
 # File: /etc/mirror/scripts/fedora-epel
 #
 
-source /etc/mirror/inc/rsync
+source /usr/share/mirror/inc/rsync
 
 rmirror mirror.cogentco.com::fedora-epel fedora/epel 4/ testing/
diff --git a/usr/share/mirror/scripts/fedora-releases b/usr/share/mirror/scripts/fedora-releases
index b7d0928..3b2b4ab 100755
--- a/usr/share/mirror/scripts/fedora-releases
+++ b/usr/share/mirror/scripts/fedora-releases
@@ -2,7 +2,7 @@
 # File: /etc/mirror/scripts/fedora-releases
 #
 
-source /etc/mirror/inc/rsync
+source /usr/share/mirror/inc/rsync
 
 rmirror mirrors.kernel.org::fedora/releases fedora/linux/releases 21/ 22/ 23/ test/ */Live */debug */armhfp
 
diff --git a/usr/share/mirror/scripts/fedora-updates b/usr/share/mirror/scripts/fedora-updates
index 4ba729d..e78b71f 100755
--- a/usr/share/mirror/scripts/fedora-updates
+++ b/usr/share/mirror/scripts/fedora-updates
@@ -2,6 +2,6 @@
 # File: /etc/mirror/scripts/fedora-updates
 #
 
-source /etc/mirror/inc/rsync
+source /usr/share/mirror/inc/rsync
 
 rmirror mirror.lstn.net::fedora-enchilada/updates fedora/linux/updates '[89]/' '1[0-9]/' '2[0-3]/' testing/ */ppc */ppc64 */armhfp
diff --git a/usr/share/mirror/scripts/linuxmint-isos b/usr/share/mirror/scripts/linuxmint-isos
index 674f96e..33a1cc3 100755
--- a/usr/share/mirror/scripts/linuxmint-isos
+++ b/usr/share/mirror/scripts/linuxmint-isos
@@ -2,6 +2,6 @@
 # File: /etc/mirror/scripts/linuxmint
 #
 
-source /etc/mirror/inc/rsync
+source /usr/share/mirror/inc/rsync
 
 rmirror rsync://ftp.heanet.ie/pub/linuxmint.com linuxmint/isos
diff --git a/usr/share/mirror/scripts/linuxmint-repos b/usr/share/mirror/scripts/linuxmint-repos
index d73136c..1e808b5 100755
--- a/usr/share/mirror/scripts/linuxmint-repos
+++ b/usr/share/mirror/scripts/linuxmint-repos
@@ -2,6 +2,6 @@
 # File: /etc/mirror/scripts/linuxmint
 #
 
-source /etc/mirror/inc/rsync
+source /usr/share/mirror/inc/rsync
 
 rmirror rsync://rsync-packages.linuxmint.com/packages linuxmint/packages
diff --git a/usr/share/mirror/scripts/putty b/usr/share/mirror/scripts/putty
index 82e7edd..b58fd8b 100755
--- a/usr/share/mirror/scripts/putty
+++ b/usr/share/mirror/scripts/putty
@@ -2,7 +2,7 @@
 # File: /etc/mirror/scripts/putty
 #
 
-source /etc/mirror/inc/rsync
+source /usr/share/mirror/inc/rsync
 
 rmirror rsync.chiark.greenend.org.uk::ftp/users/sgtatham/putty-website-mirror putty
 
diff --git a/usr/share/mirror/scripts/rsyslog b/usr/share/mirror/scripts/rsyslog
index 8776f43..da9c287 100755
--- a/usr/share/mirror/scripts/rsyslog
+++ b/usr/share/mirror/scripts/rsyslog
@@ -2,7 +2,7 @@
 # File: /etc/mirror/scripts/rsyslog
 # Reference: http://www.freeside.biz/mediawiki/index.php/Freeside:Documentation:MirroringRPMRepo
 
-source /etc/mirror/inc/rsync
+source /usr/share/mirror/inc/rsync
 
 mkdir -p /mnt/mirror/rsyslog >/dev/null 2>&1
 cd /mnt/mirror/rsyslog
diff --git a/usr/share/mirror/scripts/ssh b/usr/share/mirror/scripts/ssh
index d08f629..2e530bb 100755
--- a/usr/share/mirror/scripts/ssh
+++ b/usr/share/mirror/scripts/ssh
@@ -2,6 +2,6 @@
 # File: /etc/mirror/scripts/ssh
 # 
 
-source /etc/mirror/inc/rsync
+source /usr/share/mirror/inc/rsync
 
 rmirror mirrors.nycbug.org::OpenBSD/OpenSSH ssh
diff --git a/usr/share/mirror/scripts/ubuntu b/usr/share/mirror/scripts/ubuntu
index b575ba6..e308bab 100755
--- a/usr/share/mirror/scripts/ubuntu
+++ b/usr/share/mirror/scripts/ubuntu
@@ -2,6 +2,6 @@
 # File: /etc/mirror/scripts/ubuntu/ubuntu
 # 
 
-source /etc/mirror/inc/rsync
+source /usr/share/mirror/inc/rsync
 
 rmirror archive.ubuntu.com::ubuntu ubuntu/ubuntu *breezy* *warty* *hoary* *dapper* *edgy* *feisty* gutsy* intrepid* jaunty* karmic* lucid* maverick* natty* oneiric* quantal* raring* saucy* vivid* wily*  *[_-]powerpc* *[_-]sparc* *[_-]ia64* pool/**/*.tar.* *.diff.gz* *.dsc source/
diff --git a/usr/share/mirror/scripts/ubuntu-releases b/usr/share/mirror/scripts/ubuntu-releases
index 14a2406..c8ea52b 100755
--- a/usr/share/mirror/scripts/ubuntu-releases
+++ b/usr/share/mirror/scripts/ubuntu-releases
@@ -2,6 +2,6 @@
 # File: /etc/mirror/scripts/ubuntu-releases
 # 
 
-source /etc/mirror/inc/rsync
+source /usr/share/mirror/inc/rsync
 
 rmirror rsync://mirrors.us.kernel.org/ubuntu-releases/ ubuntu/releases edubuntu/ *powerpc* *sparc* *-4.*-* *-5.*-* *-6.*-*