puppetforge.sh refactored