diff options
| -rw-r--r-- | include/get.sh | 22 | ||||
| -rw-r--r-- | include/init.sh | 1 | ||||
| -rw-r--r-- | include/mrc.sh | 1 | ||||
| -rw-r--r-- | include/release.sh | 16 |
4 files changed, 14 insertions, 26 deletions
diff --git a/include/get.sh b/include/get.sh index bc47a075..862bc330 100644 --- a/include/get.sh +++ b/include/get.sh @@ -139,25 +139,13 @@ xbget() [ "$1" != "curl" ] && [ "$1" != "copy" ] && [ "$1" != "git" ] && \ err "Bad dlop (arg 1)" "xbget" "$@" - for url in "$2" "$3" - do - if [ -z "$url" ]; then + for url in "$2" "$3"; do + [ -z "$url" ] && \ err "empty URL given in" "xbget" "$@" - elif ! try_fetch "$url" "$@"; then + try_fetch "$url" "$@" || \ continue - fi - - case "$1" in - git) - [ ! -d "$4" ] && \ - continue - ;; - *) - [ ! -f "$4" ] && \ - continue - ;; - esac - return 0 # successful download/copy + [ -e "$4" ] && \ + return 0; : # successful download/copy done err "failed to download file/repository" "xbget" "$@"; : diff --git a/include/init.sh b/include/init.sh index 70c6591f..468842e0 100644 --- a/include/init.sh +++ b/include/init.sh @@ -406,6 +406,7 @@ xbmk_git_init() x_ git -c user.name="xbmk" -c user.email="xbmk@example.com" \ tag -a "$version" -m "$projectname $version" \ 1>/dev/null 2>/dev/null; : + ) || err "Can't initialise workdir" xbmk_git_init "$@"; : } diff --git a/include/mrc.sh b/include/mrc.sh index e75b37e7..bb3687ea 100644 --- a/include/mrc.sh +++ b/include/mrc.sh @@ -58,7 +58,6 @@ extract_partition() parted "${1%.zip}" 2>/dev/null | grep "ROOT-A" ) START=$(( $( echo $ROOTP | cut -f2 -d\ | tr -d "B" ) )) - SIZE=$(( $( echo $ROOTP | cut -f4 -d\ | tr -d "B" ) )) x_ dd if="${1%.zip}" of="root-a.ext2" bs=1024 \ diff --git a/include/release.sh b/include/release.sh index d0b35edd..8a429598 100644 --- a/include/release.sh +++ b/include/release.sh @@ -60,13 +60,13 @@ release() prep_release() { ( - if [ "$1" != "tarball" ]; then - x_ cd "$rsrc" - [ ! -e "cache" ] && \ - x_ ln -s "$XBMK_CACHE" "cache"; : - fi + if [ "$1" != "tarball" ]; then + x_ cd "$rsrc" + [ ! -e "cache" ] && \ + x_ ln -s "$XBMK_CACHE" "cache"; : + fi - prep_release_$1 + prep_release_$1 ) || err "can't prep release $1" "prep_release" "$@" } @@ -105,8 +105,8 @@ prep_release_tarball() x_ mv "$rsrc/util/sbase2" "$rsrc/util/sbase" ( - x_ cd "${rsrc%/*}" - x_ mktarball "${rsrc##*/}" "${rsrc##*/}.tar.xz" + x_ cd "${rsrc%/*}" + x_ mktarball "${rsrc##*/}" "${rsrc##*/}.tar.xz" ) || err "can't create src tarball" "prep_release_tarball" "$@"; : } |