diff options
| -rwxr-xr-x | contrib/angstrom/sort.sh | 13 | ||||
| -rw-r--r-- | contrib/angstrom/upload-packages.sh | 8 |
2 files changed, 14 insertions, 7 deletions
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index e25d0d934a..044b64ef07 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -14,11 +14,6 @@ find */ -name "*.ipk" -exec mv '{}' ./ \; # Make a list of ipkg files already present in feeds and in unsorted echo "Making a list of unsorted packages" for i in $(find . -name "*.ipk") ; do basename $i ; done > files-unsorted -if [ "$1" != "--skip-sorted-list" ]; then - echo "Making a list of sorted packages (takes long)" - for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted -fi - # Make a list of duplicates and delete those echo "Finding duplicate packages in unsorted" cat files-sorted files-unsorted | sort | uniq -d > files-duplicate @@ -28,8 +23,9 @@ cat files-duplicate | xargs rm -f # Log remaining packages to a file find . -name "*.ipk" |grep -v dbg | grep -v -- -dev | grep -v -- -doc | grep -v angstrom-version | grep -v locale > new-files.txt for newfile in $(cat new-files.txt | sed s:./::g) ; do - echo "$(date -u +%s) $newfile $(basename ${PWD})" >> ../upload.txt + echo "$(date -u +%s) $newfile $(basename ${PWD})" >> ../upload-full.txt done +tail -n 100 ../upload-full.txt > ../upload.txt do_sort() { archdir=$arch @@ -142,4 +138,9 @@ for arch in arm-oabi armv4t armv5teb armv5te armv6 armv7a armv7 avr32 bfin geode do_sort done +if [ "$1" != "--skip-sorted-list" ]; then + echo "Updating list of sorted packages (takes long)" + for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted +fi + (cd ~/website/repo ; php update.php) diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index 1b457a5fc9..8942a0929c 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -14,22 +14,28 @@ REMOTED=website/feeds/2008/ipk/$(basename $PWD) mkdir -p upload-queue || true # Find and delete morgue dirs, we don't need them +echo "Deleting morgue directories" find ipk/ -name "morgue" -exec rm -rf \{\} \; # Copy all packages to an upload queue +echo "Copying packages to upload queue" find ipk/ -name "*.ipk" -exec cp \{\} upload-queue/ \; # Find file already present on webserver -ssh $REMOTEM "find $REMOTED/ -name "*.ipk" -exec basename \{\} \;" > files-remote +echo "Getting file list from server" +scp $REMOTEM:$REMOTED/unsorted/files-sorted files-remote ls upload-queue/ | grep -v morgue > files-local # Check for files already present on webserver +echo "Checking for duplicates" cat files-remote files-local | sort | uniq -u >files-uniq cat files-uniq files-local | sort | uniq -d > files-trans # Copy over non-duplicate files +echo "Starting rsync..." rsync -vz --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/ # Clean up temporary files +echo "Removing upload queue" rm -rf files-remote files-local files-uniq files-trans upload-queue |