add some checks.
fix extracting variable.
Merge branch 'feature-reorganized-rpm'