summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rwxr-xr-xrepo-update10
-rwxr-xr-xyf-update11
3 files changed, 17 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index ee8bbb8..dd17455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@ local_config
test/packages/*/*.pkg.tar.?z
\#*#
.#*
-yftime \ No newline at end of file
+yftime
+src*
+pkg* \ No newline at end of file
diff --git a/repo-update b/repo-update
index 4631627..12c6d0c 100755
--- a/repo-update
+++ b/repo-update
@@ -5,6 +5,14 @@ source $(dirname $0)/config
source $(dirname $0)/local_config
source $(dirname $0)/libremessages
+msg "Updating your-freedom"
+$(dirname $0)/yf-update
+
+msg "Global exclude-list"
+# To not downgrade repos by accident
+find ${repodir}/old/packages -name "*${PKGEXT}" \
+ -fprintf ${rsync_not_needed}2 '%f\n'
+
for repo in ${ARCHREPOS[@]}; do
msg "Syncing ${repo}"
for arch in ${ARCHARCHES[@]} 'any'; do
@@ -24,8 +32,6 @@ for repo in ${ARCHREPOS[@]}; do
plain "Excluding our packages"
find ${repodir}/${repo} -name "*${PKGEXT}" \
-fprintf ${rsync_not_needed} '%f\n'
- find ${repodir}/old/packages -name "*${PKGEXT}" \
- -fprintf ${rsync_not_needed}2 '%f\n'
# Actual rsync command
plain "Syncing..."
${rsync_update_command} \
diff --git a/yf-update b/yf-update
index c65fc09..9c2131e 100755
--- a/yf-update
+++ b/yf-update
@@ -1,17 +1,18 @@
#!/bin/bash
source $(dirname $0)/local_config
source $(dirname $0)/config
+source $(dirname $0)/libremessages
blacklist_mtime=$(printf "%.0f" $(find ${blacklist} -printf "%T@"))
last_bl_mtime=$(cat $(dirname $0)/yftime)
if [ $blacklist_mtime -gt $last_bl_mtime ]; then
pushd $(dirname $0)/yf
- makepkg
- rsync -L ./*.${PKGEXT} ${STAGING}/libre
+ makepkg -f
+ find . -name "*${PKGEXT}" -exec mv {} ${STAGING}/libre \;
popd
echo ${blacklist_mtime} > $(dirname $0)/yftime
+ msg2 "built and staged"
+else
+ msg2 "nothing to do"
fi
-
-
-