angstrom feed sorter: update package browser before stripping source lines

diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index 94b8cb6..d624000 100755 (executable)
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -144,6 +144,8 @@ for i in ../* ; do
 echo " DONE"
 cd ${BPWD}
 
+( cd ~/website/repo-updater ; php update.php ; rm ../repo/feeds.db* ; cp feeds.db* ../repo )
+
 echo -n "Stripping source lines from Package files"
 for i in `find . -name Packages` ; do grep -v ^Source: $i|gzip -c9>$i.gz ;gunzip -c $i.gz>$i ; touch $i.sig ; done
 echo " DONE"
@@ -162,4 +164,3 @@ if [ "$1" != "--skip-sorted-list" ]; then
     for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted
 fi
 
-( cd ~/website/repo-updater ; php update.php ; rm ../repo/feeds.db* ; cp feeds.db* ../repo )

diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh
index 4d3362b..1ae7086 100644 (file)
--- a/contrib/angstrom/upload-packages.sh
+++ b/contrib/angstrom/upload-packages.sh
@@ -31,6 +31,9 @@ echo "Checking for duplicates"
 cat files-remote files-local | sort | uniq -u >files-uniq
 cat files-uniq files-local | sort | uniq -d > files-trans
 
+# Remove SGX files
+rm -f upload-queue/*3.00.*
+
 # Copy over non-duplicate files
 echo "Starting rsync..."
 rsync -vz --copy-links --progress --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/