summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2009-07-20 18:51:04 -0400
committerAaron Griffin <aaronmgriffin@gmail.com>2009-07-20 18:51:04 -0400
commit754d26d772570d02c878ab6afc3dc5f75e17e373 (patch)
tree71468e494307d1bce791edf7b09896483328fd15
parent755ba2fd1198272914e540806e9bfb94416da0ca (diff)
ftpdir-cleanup: Fixes for 'any' support
* Break out ftppath, base it on ftbpath_base * Only check ARCHINDEPFILES if the any dir exists * Attempt to restore symlinks before moving 'any' files out of the way Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rwxr-xr-xmisc-scripts/ftpdir-cleanup50
1 files changed, 40 insertions, 10 deletions
diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup
index 9bac030..7de64b9 100755
--- a/misc-scripts/ftpdir-cleanup
+++ b/misc-scripts/ftpdir-cleanup
@@ -10,10 +10,11 @@ arch=$2
dest=$3
##### Arch specific stuff. TODO make this configurable #####
-ftppath="/srv/ftp/$reponame/os/$arch/"
ftppath_base="/srv/ftp/$reponame/os"
############################################################
+ftppath="$ftppath_base/$arch"
+
if [ ! -d "$ftppath" ]; then
echo "FTP path '$ftppath' does not exist"
exit 1
@@ -32,7 +33,6 @@ getpkgname() {
tmp=${1##*/}
tmp=${tmp%$PKGEXT}
tmp=${tmp%-$arch}
- tmp=${tmp%-any}
echo ${tmp%-*-*}
}
@@ -41,8 +41,7 @@ getpkgname_ver() {
tmp=${1##*/}
tmp=${tmp%$PKGEXT}
- tmp=${tmp%-$arch}
- echo ${tmp%-any}
+ echo ${tmp%-$arch}
}
MISSINGFILES=""
@@ -82,12 +81,14 @@ for pkg in *$arch$PKGEXT; do
EXTRAFILES="$EXTRAFILES $pkg"
done
-cd "$ftppath_base/any"
-for pkg in *$PKGEXT; do
- if [ ! -h $ftppath_base/i686/$pkg -a ! -h $ftppath_base/x86_64/$pkg ]; then
- ARCHINDEPFILES="$ARCHINDEPFILES $pkg"
- fi
-done
+if [ -d "$ftppath_base/any" ]; then
+ cd "$ftppath_base/any"
+ for pkg in *$PKGEXT; do
+ if [ ! -h $ftppath_base/i686/$pkg -a ! -h $ftppath_base/x86_64/$pkg ]; then
+ ARCHINDEPFILES="$ARCHINDEPFILES $pkg"
+ fi
+ done
+fi
cd "$ftppath"
rm -rf ${TMPDIR}
@@ -97,6 +98,35 @@ if [ -z "$DELETEFILES$MISSINGFILES$EXTRAFILES$ARCHINDEPFILES" ]; then
exit 0
fi
+#Do a quick check. If we have a MISSINGFILE and an ARCHINDEPFILE of the same
+#name to remove, then let's restore the symlink.
+
+archfiles="$ARCHINDEPFILES"
+ARCHINDEPFILES=""
+for af in $archfiles; do
+ af_satisfied=0
+ for mf in $MISSINGFILES; do
+ if [ "${af}" = "${mf}" ]; then
+ ln -s "${ftppath_base}/any/${af}" "${ftppath}"
+ af_satisfied=1
+ fi
+
+ done
+ if [ $af_satisfied -eq 0 ]; then
+ ARCHINDEPFILES="${ARCHINDEPFILES} ${af}"
+ fi
+done
+#rescan missing files now
+missfiles="$MISSINGFILES"
+MISSINGFILES=""
+for mf in $missfiles; do
+ if [ ! -e "${ftppath}/${mf}" ]; then
+ MISSINGFILES="${MISSINGFILES} ${mf}"
+ else
+ echo "Missing file has been restored: $mf"
+ fi
+done
+
echo "Scan complete for $reponame ($arch) at ${ftppath}"
if [ -n "$DELETEFILES" ]; then