diff options
| author | Naram Qashat <cyberbotx@cyberbotx.com> | 2010-06-26 01:39:11 -0400 |
|---|---|---|
| committer | Naram Qashat <cyberbotx@cyberbotx.com> | 2010-06-26 01:39:11 -0400 |
| commit | 4e31757f1467b36034e1dcef10d78533ff302d57 (patch) | |
| tree | 1cc9e0ec4f450c7fa33ced1b0e39a3355fedd636 /install.js | |
| parent | 6dc3af5db41ecb24669b259c776c51964539d531 (diff) | |
| parent | c7cb8897b400f5df31d0ae12dcce892a2b0d1590 (diff) | |
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'install.js')
| -rw-r--r-- | install.js | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/install.js b/install.js index 9215a10bd..c8d918f78 100644 --- a/install.js +++ b/install.js @@ -13,7 +13,7 @@ // var anopeVersion = "Unknown"; -var vMaj, vMin, vPat, vBuild, vExtra; +var vMaj, vMin, vPat, vExtra; var installerResponses = new Array(); @@ -258,13 +258,13 @@ else // Functions function FindAnopeVersion() { - if (!fso.FileExists(ScriptPath + 'version.log')) + if (!fso.FileExists(ScriptPath + 'src\\version')) { anopeVersion = 'Unknown'; return; } - var versionLog = fso.OpenTextFile(ScriptPath + 'version.log'); + var versionLog = fso.OpenTextFile(ScriptPath + 'src\\version'); while (!versionLog.atEndOfStream) { var versionLine = versionLog.readline(); @@ -292,14 +292,9 @@ function FindAnopeVersion() { vExtra = versionLine.replace('VERSION_EXTRA=', ''); continue; } - if (versionLine.match(/VERSION_BUILD=/g)) - { - vBuild = versionLine.replace('VERSION_BUILD=', ''); - continue; - } } versionLog.close(); - anopeVersion = vMaj + '.' + vMin + '.' + vPat + '.' + vBuild + vExtra; + anopeVersion = vMaj + '.' + vMin + '.' + vPat + vExtra; return; } |