[zsh] use sh trap to ensure popd always happens

[zsh] use sh trap to ensure popd always happens #89