=== modified file 'wpkg.js'
--- wpkg.js	2008-10-21 07:56:40 +0000
+++ wpkg.js	2008-10-21 08:38:44 +0000
@@ -4718,9 +4718,9 @@
 		// load packages
 		setPackages(loadXml(packages_file, packages_folder, "packages"));
 	} else {
-		var packages_file = base + "/" + web_packages_file_name;
-		var profiles_file = base + "/" + web_profiles_file_name;
-		var hosts_file = base + "/" + web_hosts_file_name;
+		var packages_file = base + "/" + expandVariable(web_packages_file_name);
+		var profiles_file = base + "/" + expandVariable(web_profiles_file_name);
+		var hosts_file = base + "/" + expandVariable(web_hosts_file_name);
 		var nodes = loadXml( profiles_file, null, null );
 		if (nodes == null) {
 			// connot continue without profiles (probably network error occurred)
@@ -6294,3 +6294,47 @@
 	}
 	return ret;
 }
+
+/**
+ * expandVariable - expand shell variable and WPKG regexp
+ * @param variable to expand
+ * @return expanded variable string
+ */
+function expandVariable(var) {
+        // build log file name
+        var today = new Date();
+        var year = today.getFullYear();
+        var month = today.getMonth() + 1;
+        var day = today.getDate();
+        var hour = today.getHours();
+        var minute = today.getMinutes();
+        var second = today.getSeconds();
+        if (month < 10) {
+                month = "0" + month;
+        }
+        if (day < 10) {
+                day = "0" + day;
+        }
+        if (hour < 10) {
+                hour = "0" + hour;
+        }
+        if (minute < 10) {
+                minute = "0" + minute;
+        }
+        if (second < 10) {
+                second = "0" + second;
+        }
+
+        var expandedVar = var.replace(new RegExp("\\[HOSTNAME\\]", "g"), getHostname());
+        expandedVar = var.replace(new RegExp("\\[YYYY\\]", "g"), year);
+        expandedVar = var.replace(new RegExp("\\[MM\\]", "g"), month);
+        expandedVar = var.replace(new RegExp("\\[DD\\]", "g"), day);
+        expandedVar = var.replace(new RegExp("\\[hh\\]", "g"), hour);
+        expandedVar = var.replace(new RegExp("\\[mm\\]", "g"), minute);
+        expandedVar = var.replace(new RegExp("\\[ss\\]", "g"), second);
+
+        var shell = new ActiveXObject("WScript.Shell");
+        expandedVar = shell.ExpandEnvironmentStrings(expandedVar);
+
+        return expandedVar;
+}
\ No newline at end of file