[PATCH-next 0/1] Refactor of setup script