@@ -137,9 +137,10 @@ rm -rf $DIRS_TO_CLEAN

 FILES_TO_CLEAN=".localrc.auto .localrc.password "

 FILES_TO_CLEAN+="docs/files docs/html shocco/ "

 FILES_TO_CLEAN+="stack-screenrc test*.conf* test.ini* "

-FILES_TO_CLEAN+=".stackenv .prereqs "

-FILES_TO_CLEAN+="~/.config/openstack"

+FILES_TO_CLEAN+=".stackenv .prereqs"

 for file in $FILES_TO_CLEAN; do

     rm -rf $TOP_DIR/$file

 done

+

+rm -rf ~/.config/openstack

@@ -123,7 +123,7 @@ function write_clouds_yaml {

         --os-project-name admin

     # CLean up any old clouds.yaml files we had laying around

-    rm -f ~$STACK_USER/.config/openstack/clouds.yaml

+    rm -f $(eval echo ~"$STACK_USER")/.config/openstack/clouds.yaml

 }

 # trueorfalse <True|False> <VAR>