release: don't use subdirectories until after images are created

gnome.img references jffs2/gnome.dat; that's incorrect.

Signed-off-by: Andres Salomon <dilinger@debian.org>

diff --git a/release.sh b/release.sh
index 1b6fed32cff9d3cabdd5215120a38ecd22dd1468..8cca167fa7623e83d726d47019130b78cfcc2e76 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -3,12 +3,15 @@
 # prepare a release
 for f in *.packages; do
        desktop=$(echo $f | sed 's/\.packages//')
-       mkdir -p ext3 jffs2
        ./initchroot.sh --package-list ${f} \
                        --local-apt-mirror "deb http://localhost:9999/debian lenny main contrib non-free
 deb http://localhost:9999/security lenny/updates main contrib non-free" \
                        debxo-${desktop}
-       ./mkjffs2.sh debxo-${desktop} jffs2/${desktop}.img
-       ./mkext3.sh debxo-${desktop} ext3/debxo-${desktop}.ext3.img
-       gzip ext3/debxo-${desktop}.ext3.img
+       ./mkjffs2.sh debxo-${desktop} ${desktop}.img
+       ./mkext3.sh debxo-${desktop} debxo-${desktop}.ext3.img
+       gzip debxo-${desktop}.ext3.img
+
+       mkdir -p ext3 jffs2
+       mv debxo-${desktop}.ext3.img.gz ext3
+       mv ${desktop}.img ${desktop}.dat jffs2
 done