Compare commits

...

3 Commits
0.6.3 ... 0.6.4

Author SHA1 Message Date
Aaron Griffin
aa39a8a11f Remove the 'add' dir from staging
This extra dir is largely useless. db-remove makes the del/
dir unnecessary, so lets kill the add/ dir too

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-11-21 13:38:21 -08:00
Eric Bélanger
d40455cabd Switch archco svn path: home -> srv
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-11-21 13:36:07 -08:00
Aaron Griffin
a80fe69f4b Only run locale-gen if the target root has /etc/locale.gen
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-20 01:09:43 -05:00
3 changed files with 7 additions and 5 deletions

2
archco
View File

@@ -6,5 +6,5 @@ if [ "$1" = "" ]; then
fi
for i in "$@"; do
svn co svn+ssh://svn.archlinux.org/home/svn-packages/$i
svn co svn+ssh://svn.archlinux.org/srv/svn-packages/$i
done

View File

@@ -64,7 +64,7 @@ fi
if [ "$repo" != "community" ]; then
# combine what we know into a variable
uploadto="staging/${repo}/add/$(basename ${pkgfile})"
uploadto="staging/${repo}/$(basename ${pkgfile})"
scp ${scpopts} "${pkgfile}" "archlinux.org:${uploadto}"
if [ "$(md5sum "${pkgfile}" | cut -d' ' -f1)" != "$(ssh archlinux.org md5sum "${uploadto}" | cut -d' ' -f1)" ]; then
echo "File got corrupted during upload, cancelled."

View File

@@ -171,9 +171,11 @@ else
cp ${makepkg_conf} ${working_dir}/etc/makepkg.conf
fi
echo "generating default locales"
cp /etc/locale.gen "${working_dir}/etc/locale.gen"
chroot "${working_dir}" locale-gen
if [ -e "${working_dir}/etc/locale.gen" ]; then
echo "generating default locales from host system"
cp /etc/locale.gen "${working_dir}/etc/locale.gen"
chroot "${working_dir}" locale-gen
fi
if [ ! -e "${working_dir}/.arch-chroot" ]; then
date +%s > "${working_dir}/.arch-chroot"