More updates on the script

Integrate recovery building script into the main one
More clean-up and avoid code duplication

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>