diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-02-24 20:53:04 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-02-24 20:53:04 +0000 |
commit | 074bc6c09aadcc78ea300c578734a69f56decfab (patch) | |
tree | 1d946ea6e387f2031c6b61afa873c7a936a3580a /tools | |
parent | 80410f21b96714f220cdcc8c3c995e91f4e209b8 (diff) | |
download | rockbox-074bc6c09aadcc78ea300c578734a69f56decfab.tar.gz rockbox-074bc6c09aadcc78ea300c578734a69f56decfab.zip |
Rearrange a bit, so that it checks for the build dir after downloading, makes it a bit more obvious that redownloading isn't needed, but only deletion of the build dir.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20099 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/rockboxdev.sh | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index e3e9a0cbb4..d322ef1a50 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh | |||
@@ -131,13 +131,6 @@ if test ! -w $prefix; then | |||
131 | fi | 131 | fi |
132 | 132 | ||
133 | 133 | ||
134 | ########################################################################### | ||
135 | # If there's already a build dir, we don't overwrite it | ||
136 | if test -d $builddir; then | ||
137 | echo "You already have a $builddir directory!" | ||
138 | echo "Please remove it and re-run the script" | ||
139 | exit | ||
140 | fi | ||
141 | 134 | ||
142 | cleardir () { | 135 | cleardir () { |
143 | # $1 is the name of the build dir | 136 | # $1 is the name of the build dir |
@@ -213,9 +206,6 @@ else | |||
213 | pathadd="$bindir" | 206 | pathadd="$bindir" |
214 | fi | 207 | fi |
215 | 208 | ||
216 | mkdir -p $builddir | ||
217 | cd $builddir | ||
218 | |||
219 | summary="summary-$1" | 209 | summary="summary-$1" |
220 | 210 | ||
221 | echo "============================ Summary ============================" > $summary | 211 | echo "============================ Summary ============================" > $summary |
@@ -262,6 +252,18 @@ if test -n "$gccpatch"; then | |||
262 | fi | 252 | fi |
263 | fi | 253 | fi |
264 | 254 | ||
255 | ########################################################################### | ||
256 | # If there's already a build dir, we don't overwrite it | ||
257 | if test -d $builddir; then | ||
258 | echo "You already have a $builddir directory!" | ||
259 | echo "Please remove it and re-run the script" | ||
260 | exit | ||
261 | else | ||
262 | mkdir -p $builddir | ||
263 | cd $builddir | ||
264 | fi | ||
265 | |||
266 | |||
265 | echo "ROCKBOXDEV: extracting binutils-$binutils in $builddir" | 267 | echo "ROCKBOXDEV: extracting binutils-$binutils in $builddir" |
266 | tar xjf $dlwhere/binutils-$binutils.tar.bz2 | 268 | tar xjf $dlwhere/binutils-$binutils.tar.bz2 |
267 | echo "ROCKBOXDEV: extracting gcc-$gccver in $builddir" | 269 | echo "ROCKBOXDEV: extracting gcc-$gccver in $builddir" |