Add popd's before returning in shark/init.sh