Test for "$CAL_USR"/"$CAL_PWD"

refreshAuth

@@ -10,15 +10,19 @@ fi
 
 AUTH_FILE='/srv/www/data/webapps/js/vl-auth.js'
 
-source /etc/environment
-
-#echo "$CAL_USR"
-#echo "$CAL_PWD"
+if [ -f /etc/environment ]; then
+  source /etc/environment
+fi
 
-echo "Update: ${AUTH_FILE}"
-sed -i "s/couchdb_usr:'.*'/couchdb_usr:'${CAL_USR}'/" ${AUTH_FILE}
-sed -i "s/couchdb_pw:'.*'/couchdb_pw:'${CAL_PWD}'/" ${AUTH_FILE}
+if [ ! -z "$CAL_USR" ] && [ ! -z "$CAL_PWD" ]; then
+  #echo "$CAL_USR"
+  #echo "$CAL_PWD"
 
-chown ${DEST_USER}:${DEST_GROUP} ${AUTH_FILE}
+  echo "Update: ${AUTH_FILE}"
+  sed -i "s/couchdb_usr:'.*'/couchdb_usr:'${CAL_USR}'/" ${AUTH_FILE}
+  sed -i "s/couchdb_pw:'.*'/couchdb_pw:'${CAL_PWD}'/" ${AUTH_FILE}
+  chown ${DEST_USER}:${DEST_GROUP} ${AUTH_FILE}
+fi
 
 exit
+