six-updater 0.10.3 → 0.10.4
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -1
- data/lib/six/updater.rb +6 -2
- data/lib/six/updater/gitrepo.rb +2 -0
- data/lib/six/updater/mod.rb +5 -0
- metadata +2 -2
data/Rakefile
CHANGED
data/lib/six/updater.rb
CHANGED
@@ -44,13 +44,13 @@ end
|
|
44
44
|
module Six
|
45
45
|
# TODO: Evaluate if this module should be a class instead?
|
46
46
|
module Updater
|
47
|
-
VERSION = '0.10.
|
47
|
+
VERSION = '0.10.4'
|
48
48
|
COMPONENT = 'six-updater'
|
49
49
|
|
50
50
|
# Configuration
|
51
51
|
ARMA2 = ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2', 'MAIN']
|
52
52
|
ARMA2_ALT = ['SOFTWARE\\Bohemia Interactive\\ArmA 2', 'InstallPath']
|
53
|
-
ARMA2_STEAM = ['SOFTWARE\\
|
53
|
+
ARMA2_STEAM = ['SOFTWARE\\Valve\\Steam\\Common\\ARMA 2\\', 'InstallPath']
|
54
54
|
# Fix for WinXP
|
55
55
|
BASE_PATH = if ENV['OCRA_EXECUTABLE']
|
56
56
|
if ENV['OCRA_EXECUTABLE'][/(.*)[\/|\\].*/]
|
@@ -153,6 +153,7 @@ module Six
|
|
153
153
|
%x[7z]
|
154
154
|
rescue
|
155
155
|
log.warn "7-zip not found, attempting download!"
|
156
|
+
log.debug "#{$!}"
|
156
157
|
system "six-downloader.exe \"#{File.join(BASE_PATH, 'six-downloader_7z.yml').gsub('/', '\\')}\" --output \"#{TOOL_PATH.gsub('/', '\\')}\""
|
157
158
|
file = File.join(TOOL_PATH, "7z.exe")
|
158
159
|
unless FileTest.exist?(file)
|
@@ -188,6 +189,7 @@ module Six
|
|
188
189
|
)
|
189
190
|
rescue
|
190
191
|
log.warn "WARNING: Something went wrong starting the app: #{@config[:app_exe]}"
|
192
|
+
log.debug "#{$!}"
|
191
193
|
end
|
192
194
|
end
|
193
195
|
|
@@ -257,6 +259,7 @@ module Six
|
|
257
259
|
%x[git]
|
258
260
|
@config[:git_path] = 'PATH'
|
259
261
|
rescue
|
262
|
+
log.debug "#{$!}"
|
260
263
|
zipcheck
|
261
264
|
log.warn "Git not configured, nor found in path... Downloading!"
|
262
265
|
# download from http://alturl.com/hn84 into name; git.7z
|
@@ -415,6 +418,7 @@ module Six
|
|
415
418
|
end
|
416
419
|
rescue
|
417
420
|
log.warn "WARNING: Server configured but unable to get data from repository"
|
421
|
+
log.debug "#{$!}"
|
418
422
|
end
|
419
423
|
end
|
420
424
|
|
data/lib/six/updater/gitrepo.rb
CHANGED
@@ -41,6 +41,7 @@ module Six
|
|
41
41
|
done = true
|
42
42
|
rescue
|
43
43
|
log.debug "WARNING: Failed, trying other mirrors if available"
|
44
|
+
log.debug "#{$!}"
|
44
45
|
end
|
45
46
|
end
|
46
47
|
log.warn "WARNING: Failed, was unable to clone!" unless done
|
@@ -75,6 +76,7 @@ module Six
|
|
75
76
|
done = true
|
76
77
|
rescue
|
77
78
|
log.debug "WARNING: Failed, trying other mirrors if available"
|
79
|
+
log.debug "#{$!}"
|
78
80
|
end
|
79
81
|
end
|
80
82
|
log.warn "WARNING: Failed, was unable to update!" unless done
|
data/lib/six/updater/mod.rb
CHANGED
@@ -98,6 +98,7 @@ module Six
|
|
98
98
|
true
|
99
99
|
rescue
|
100
100
|
log.warn "WARNING: Unable to write version.txt file, please make sure everything arma is closed, etc"
|
101
|
+
log.debug "#{$!}"
|
101
102
|
false
|
102
103
|
end
|
103
104
|
end
|
@@ -210,6 +211,7 @@ module Six
|
|
210
211
|
@repository.status(true)
|
211
212
|
rescue
|
212
213
|
log.warn 'WARNING: Update seems to have completed but there was a status error..'
|
214
|
+
log.debug "#{$!}"
|
213
215
|
log_status
|
214
216
|
end
|
215
217
|
|
@@ -271,6 +273,7 @@ module Six
|
|
271
273
|
update
|
272
274
|
rescue
|
273
275
|
log.warn "WARNING: Failed to open the repository, not installed!"
|
276
|
+
log.debug "#{$!}"
|
274
277
|
end
|
275
278
|
else
|
276
279
|
@repository = if @repositories[0][/\Arsync:\/\//]
|
@@ -299,12 +302,14 @@ module Six
|
|
299
302
|
#write_changelog
|
300
303
|
rescue
|
301
304
|
log.warn 'WARNING: Post installation was unable to complete. This could be due to a server / connection problem. Please try again later'
|
305
|
+
log.debug "#{$!}"
|
302
306
|
FileUtils::rm_rf(@path) if FileTest.exist?(@path)
|
303
307
|
end
|
304
308
|
begin
|
305
309
|
userconfig
|
306
310
|
rescue
|
307
311
|
log.warn 'WARNING: Userconfig processing is unable to complete.'
|
312
|
+
log.debug "#{$!}"
|
308
313
|
end
|
309
314
|
else
|
310
315
|
FileUtils::rm_rf(@path) if FileTest.exist?(@path)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: six-updater
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.10.
|
4
|
+
version: 0.10.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sickboy
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2009-
|
12
|
+
date: 2009-10-17 00:00:00 +02:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|