devenv: better init

miscellaneous/devenv/.bash_login

@@ -2,14 +2,13 @@
 cd /opt/webadmin/
 if [ -d cloud ]
 then
-	:
+    :
 else
-	echo Run init.sh? [N/y]
-	read
-	if [ "$REPLY" = y ]
-	then
-		passwd
-		/home/cloud/init.sh
-	fi
+    echo Run init.sh? [N/y]
+    read
+    if [ "$REPLY" = y ]
+    then
+        source /home/cloud/init.sh
+    fi
 fi
 cd cloud

miscellaneous/devenv/clean.sh

@@ -8,7 +8,7 @@ then
     exit 1
 fi
 
-
+cp /opt/webadmin/cloud/miscellaneous/devenv/{.bash_login,init.sh,clean.sh} ~/
 rm -rf /opt/webadmin/cloud*
 rm .bash_history
 rm -f ~/.gitconfig
@@ -20,4 +20,5 @@ DROP DATABASE webadmin;
 A
 
 sudo chpasswd <<<'cloud:ezmiez'
+sudo passwd -e cloud
 rm ~/.ssh/authorized_keys

miscellaneous/devenv/init.sh

@@ -46,4 +46,4 @@ mv cloud cloud.$(date +%s) || true
 git clone 'ssh://git@giccero.cloud.ik.bme.hu/cloud'
 
 cd cloud
-miscellaneous/devenv/nextinit.sh
+source miscellaneous/devenv/nextinit.sh

miscellaneous/devenv/nextinit.sh

@@ -3,9 +3,7 @@
 cd /opt/webadmin/cloud
 ./manage.py syncdb --noinput
 ./manage.py migrate
-echo '"test" user password:'
 ./manage.py loaddata miscellaneous/dump.json
-./manage.py changepassword test
 ./manage.py update
 
 #Set up store server
@@ -36,3 +34,5 @@ sudo /opt/webadmin/cloud/miscellaneous/store-server/TopList.py >/dev/null 2>&1 &
 cd /opt/webadmin/cloud/miscellaneous/devenv
 
 sudo cp vimrc.local /etc/vim/vimrc.local
+
+./manage.py changepassword test