diff options
| author | David Walter Seikel | 2014-02-03 15:23:22 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2014-02-03 15:23:22 +1000 |
| commit | d056a17f05a1f90708f554651475e116a2ddbd68 (patch) | |
| tree | 07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/scripts/viewer_info.py | |
| parent | Updating tree and volume LOD. These go to eleven. (diff) | |
| parent | Fix up OTR prefs to not crash. (diff) | |
| download | meta-impy-next.zip meta-impy-next.tar.gz meta-impy-next.tar.bz2 meta-impy-next.tar.xz | |
Diffstat (limited to '')
| -rwxr-xr-x | linden/scripts/viewer_info.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/scripts/viewer_info.py b/linden/scripts/viewer_info.py index 53ea432..bd0f436 100755 --- a/linden/scripts/viewer_info.py +++ b/linden/scripts/viewer_info.py | |||
| @@ -54,10 +54,11 @@ class ViewerInfo: | |||
| 54 | self.major = re.search('MAJOR\s*=\s*(\d+)', data).group(1) | 54 | self.major = re.search('MAJOR\s*=\s*(\d+)', data).group(1) |
| 55 | self.minor = re.search('MINOR\s*=\s*(\d+)', data).group(1) | 55 | self.minor = re.search('MINOR\s*=\s*(\d+)', data).group(1) |
| 56 | self.patch = re.search('PATCH\s*=\s*(\d+)', data).group(1) | 56 | self.patch = re.search('PATCH\s*=\s*(\d+)', data).group(1) |
| 57 | self.release = re.search('RLEAS\s*=\s*(\d+)', data).group(1) | ||
| 57 | self.extra = re.search('EXTRA\s*=\s*"([^"]*)"', data).group(1) | 58 | self.extra = re.search('EXTRA\s*=\s*"([^"]*)"', data).group(1) |
| 58 | self.bundle_id = re.search('BUNDLE_ID\s*=\s*"([^"]*)"', data).group(1) | 59 | self.bundle_id = re.search('BUNDLE_ID\s*=\s*"([^"]*)"', data).group(1) |
| 59 | 60 | ||
| 60 | self.version = "%s.%s.%s"%(self.major, self.minor, self.patch) | 61 | self.version = "%s.%s.%s.%s"%(self.major, self.minor, self.patch, self.release) |
| 61 | if len(self.extra) > 0: | 62 | if len(self.extra) > 0: |
| 62 | # Replace spaces and some puncuation with '-' in extra | 63 | # Replace spaces and some puncuation with '-' in extra |
| 63 | extra = re.sub('[- \t:;,!+/\\"\'`]+', '-', self.extra) | 64 | extra = re.sub('[- \t:;,!+/\\"\'`]+', '-', self.extra) |