Changeset c32c6e0 in freewrt

Timestamp:

Jun 14, 2007, 5:14:54 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

59aee88

Parents:

5ee7f4b2

Message:

make this actually useful (tested)

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2806 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• scripts/flash.sh (modified) (5 diffs)

scripts/flash.sh

@@ -14 +14 @@
 
 me=${0##*/}
+wd=$(pwd)
 
 die() {
@@ -112 +113 @@
         TF=$(mktemp /tmp/fwflash.XXXXXXXXXX) || die Cannot mktemp
         TI=$(mktemp /tmp/fwflash.XXXXXXXXXX) || { rm $TF; die Cannot mktemp; }
-        trap 'rm -f $TF $TI; exit 0' 0
-        trap 'rm -f $TF $TI; exit 1' 1 2 3 5 13 15
+        trap 'cd "$wd"; rm -f $TF $TI; exit 0' 0
+        trap 'cd "$wd"; rm -f $TF $TI; exit 1' 1 2 3 5 13 15
         randsrc=/dev/arandom
         [[ -e $randsrc ]] || randsrc=/dev/urandom
@@ -135 +136 @@
                 [[ $p = fwcf.helper || -x $p ]] || die Cannot find fwcf.helper
                 # create fwcf filesystem image
-                $p -M "$paddir" >$TF || die Error creating fwcf filesystem image
+                $p -M "$paddir" >$TI || die Error creating fwcf filesystem image
+                dd if=$TI of=$TF conv=notrunc 2>&-
                 echo "TRX file constructed from '$imgfile' and FWCF from '$paddir'"
         else
@@ -153 +155 @@
 sleep 3
 
+imgdir=${imgfile%/*}
+[[ $imgdir = $imgfile ]] && imgdir=.
+imgfile=${imgfile##*/}
+cd "$imgdir"
 case $flashtype in
 wl500g)
@@ -175 +181 @@
         ;;
 esac
+cd "$wd"
 cat <<-EOF
         After flashing is finished and the device has rebooted, it will need