| author | Michael Krelin <hacker@klever.net> | 2012-01-21 10:22:45 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2012-01-21 10:22:45 (UTC) |
| commit | f1b7212e0220054bcdd4053d808939dfe3a1f52e (patch) (side-by-side diff) | |
| tree | 5fe77081af899697b641f929fb33d6c0a17c5ab2 | |
| parent | 16ae25ecd207b01b79cb7ccb72e81d2a9e84f59b (diff) | |
| download | iii-f1b7212e0220054bcdd4053d808939dfe3a1f52e.zip iii-f1b7212e0220054bcdd4053d808939dfe3a1f52e.tar.gz iii-f1b7212e0220054bcdd4053d808939dfe3a1f52e.tar.bz2 | |
make tag-photo.bash script exit nicer
meaning, "return" if sourced in
Signed-off-by: Michael Krelin <hacker@klever.net>
| -rw-r--r-- | doc/tag-photo.bash | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/tag-photo.bash b/doc/tag-photo.bash index 83f10fd..5917f12 100644 --- a/doc/tag-photo.bash +++ b/doc/tag-photo.bash @@ -37,17 +37,17 @@ $3=="POWERON" { nap=0; delete ap_dt; delete ap_ap; delete ap_rssi; delete ap; } END { for(i=0;i<nap;++i) { if((pdt-ap_dt[i])>1800) continue; printf("<access-point><mac>%s</mac><signal-strength>-%d</signal-strength></access-point>\n",ap_ap[i],ap_rssi[i]); } } ')" -[[ -z "$APS" ]] && { echo "no access points" ; exit ; } +[[ -z "$APS" ]] && { echo "no access points" ; return 2>/dev/null || exit ; } WL="$(wps_locate "$APS")" -[[ -z "$WL" ]] && { echo "couldn't find location" ; exit ; } +[[ -z "$WL" ]] && { echo "couldn't find location" ; return 2>/dev/null || exit ; } eval "$WL" -[[ -z "$wl_latitude" || -z "$wl_longitude" || -z "$wl_hpe" ]] && { echo "invalid location ($WL)"; exit; } +[[ -z "$wl_latitude" || -z "$wl_longitude" || -z "$wl_hpe" ]] && { echo "invalid location ($WL)"; return 2>/dev/null || exit; } [[ "${wl_latitude:0:1}" = '-' ]] && wl_latitude="${wl_latitude:1}" wl_latitude_ref=S || wl_latitude_ref=N [[ "${wl_longitude:0:1}" = '-' ]] && wl_longitude="${wl_longitude:1}" wl_longitude_ref=W || wl_longitude_ref=E exiftool -GPSLatitude="$wl_latitude" -GPSLongitude="$wl_longitude" -GPSLatitudeRef=$wl_latitude_ref -GPSLongitudeRef=$wl_longitude_ref -GPSVersionID=0.0.2.2 -GPSProcessingMethod=WLAN "$JPG" # XXX: exiftool doesn't like it -GPSHPositioningError="$wl_hpe" |