X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Fguestfish.pod;h=ea0b3aab009c83d3596a9917bb078863ca341379;hp=022e03e24d44abe5b2e67428c9a63bb5e7762366;hb=0ef30bbb316b50beba511a5eb4bd7174671fa1ca;hpb=1e35941f62bddafd6b88270b22b3afe4a5d37baa

diff --git a/fish/guestfish.pod b/fish/guestfish.pod
index 022e03e..ea0b3aa 100644
--- a/fish/guestfish.pod
+++ b/fish/guestfish.pod
@@ -996,14 +996,15 @@ and cleans up guestfish when the script exits:
      exit 1
  fi
  
- kill_guestfish ()
+ cleanup_guestfish ()
  {
-     kill $GUESTFISH_PID >/dev/null 2>&1 ||:
+     guestfish --remote -- exit >/dev/null 2>&1 ||:
  }
- trap kill_guestfish EXIT
+ trap cleanup_guestfish EXIT ERR
  
- guestfish --remote run
- # etc.
+ guestfish --remote -- run
+ 
+ # ...
 
 =head2 REMOTE CONTROL RUN COMMAND HANGING
 
@@ -1313,4 +1314,4 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.