Commit da4d4923392c00a6787015b0df2602a8cd8ea887
1 parent
3d08fe0509
Exists in
master
and in
1 other branch
installer.kmdr: add a check on .installer.conf to avoid running installer script…
… multiple time when window is minimized and reshown installer.sh: fix a return -1 causing a syntax error
Showing 4 changed files with 78 additions and 74 deletions Side-by-side Diff
installer/installer.kmdr
... | ... | @@ -302,7 +302,7 @@ |
302 | 302 | </font> |
303 | 303 | </property> |
304 | 304 | <property name="text"> |
305 | - <string>Copyright (c) 2007-2010 by Silvan Calarco | |
305 | + <string>Copyright (c) 2007-2011 by Silvan Calarco | |
306 | 306 | Released under the terms of the GNU GPL v3 license</string> |
307 | 307 | </property> |
308 | 308 | <property name="textFormat"> |
... | ... | @@ -399,6 +399,26 @@ |
399 | 399 | </stringlist> |
400 | 400 | </property> |
401 | 401 | </widget> |
402 | + <widget class="Label"> | |
403 | + <property name="name"> | |
404 | + <cstring>integrityCheckLabel</cstring> | |
405 | + </property> | |
406 | + <property name="geometry"> | |
407 | + <rect> | |
408 | + <x>10</x> | |
409 | + <y>20</y> | |
410 | + <width>540</width> | |
411 | + <height>70</height> | |
412 | + </rect> | |
413 | + </property> | |
414 | + <property name="text"> | |
415 | + <string>Please wait some time while the installation medium is checked for data integrity. | |
416 | +Press the skip button only if you have previously checked the medium on this computer.</string> | |
417 | + </property> | |
418 | + <property name="alignment"> | |
419 | + <set>WordBreak|AlignVCenter</set> | |
420 | + </property> | |
421 | + </widget> | |
402 | 422 | <widget class="ExecButton"> |
403 | 423 | <property name="name"> |
404 | 424 | <cstring>skipButton</cstring> |
... | ... | @@ -425,26 +445,6 @@ |
425 | 445 | </stringlist> |
426 | 446 | </property> |
427 | 447 | </widget> |
428 | - <widget class="Label"> | |
429 | - <property name="name"> | |
430 | - <cstring>integrityCheckLabel</cstring> | |
431 | - </property> | |
432 | - <property name="geometry"> | |
433 | - <rect> | |
434 | - <x>10</x> | |
435 | - <y>20</y> | |
436 | - <width>540</width> | |
437 | - <height>70</height> | |
438 | - </rect> | |
439 | - </property> | |
440 | - <property name="text"> | |
441 | - <string>Please wait some time while the installation medium is checked for data integrity. | |
442 | -Press the skip button only if you have previously checked the medium on this computer.</string> | |
443 | - </property> | |
444 | - <property name="alignment"> | |
445 | - <set>WordBreak|AlignVCenter</set> | |
446 | - </property> | |
447 | - </widget> | |
448 | 448 | <widget class="ScriptObject"> |
449 | 449 | <property name="name"> |
450 | 450 | <cstring>launchMD5script</cstring> |
... | ... | @@ -2998,6 +2998,9 @@ |
2998 | 2998 | @chainloadbox.clear |
2999 | 2999 | @setBootableCheckbox.execute() |
3000 | 3000 | @execBegin |
3001 | +conffile=~/.installer.conf | |
3002 | +[ -e $conffile ] && mv ${conffile} ${conffile}~ | |
3003 | + | |
3001 | 3004 | installdevice=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0) |
3002 | 3005 | volumes=`hal-find-by-capability --capability volume` |
3003 | 3006 | partlabel= |
... | ... | @@ -3097,6 +3100,30 @@ |
3097 | 3100 | <set>WordBreak|AlignTop</set> |
3098 | 3101 | </property> |
3099 | 3102 | </widget> |
3103 | + <widget class="Label"> | |
3104 | + <property name="name"> | |
3105 | + <cstring>installTopLabel</cstring> | |
3106 | + </property> | |
3107 | + <property name="geometry"> | |
3108 | + <rect> | |
3109 | + <x>70</x> | |
3110 | + <y>0</y> | |
3111 | + <width>490</width> | |
3112 | + <height>50</height> | |
3113 | + </rect> | |
3114 | + </property> | |
3115 | + <property name="font"> | |
3116 | + <font> | |
3117 | + <pointsize>16</pointsize> | |
3118 | + </font> | |
3119 | + </property> | |
3120 | + <property name="text"> | |
3121 | + <string>Installation in progress...</string> | |
3122 | + </property> | |
3123 | + <property name="alignment"> | |
3124 | + <set>AlignCenter</set> | |
3125 | + </property> | |
3126 | + </widget> | |
3100 | 3127 | <widget class="GroupBox"> |
3101 | 3128 | <property name="name"> |
3102 | 3129 | <cstring>ProgressGroupBox</cstring> |
... | ... | @@ -3175,27 +3202,6 @@ |
3175 | 3202 | </property> |
3176 | 3203 | </widget> |
3177 | 3204 | </widget> |
3178 | - <widget class="ProgressBar"> | |
3179 | - <property name="name"> | |
3180 | - <cstring>progressBar</cstring> | |
3181 | - </property> | |
3182 | - <property name="geometry"> | |
3183 | - <rect> | |
3184 | - <x>16</x> | |
3185 | - <y>35</y> | |
3186 | - <width>530</width> | |
3187 | - <height>41</height> | |
3188 | - </rect> | |
3189 | - </property> | |
3190 | - <property name="totalSteps"> | |
3191 | - <number>100</number> | |
3192 | - </property> | |
3193 | - <property name="associations" stdset="0"> | |
3194 | - <stringlist> | |
3195 | - <string></string> | |
3196 | - </stringlist> | |
3197 | - </property> | |
3198 | - </widget> | |
3199 | 3205 | <widget class="Label"> |
3200 | 3206 | <property name="name"> |
3201 | 3207 | <cstring>progressText</cstring> |
... | ... | @@ -3228,6 +3234,27 @@ |
3228 | 3234 | <set>AlignTop</set> |
3229 | 3235 | </property> |
3230 | 3236 | </widget> |
3237 | + <widget class="ProgressBar"> | |
3238 | + <property name="name"> | |
3239 | + <cstring>progressBar</cstring> | |
3240 | + </property> | |
3241 | + <property name="geometry"> | |
3242 | + <rect> | |
3243 | + <x>16</x> | |
3244 | + <y>35</y> | |
3245 | + <width>530</width> | |
3246 | + <height>41</height> | |
3247 | + </rect> | |
3248 | + </property> | |
3249 | + <property name="totalSteps"> | |
3250 | + <number>100</number> | |
3251 | + </property> | |
3252 | + <property name="associations" stdset="0"> | |
3253 | + <stringlist> | |
3254 | + <string></string> | |
3255 | + </stringlist> | |
3256 | + </property> | |
3257 | + </widget> | |
3231 | 3258 | <widget class="ScriptObject"> |
3232 | 3259 | <property name="name"> |
3233 | 3260 | <cstring>launchinstall</cstring> |
... | ... | @@ -3245,6 +3272,7 @@ |
3245 | 3272 | <string>@NextBox.setChecked(false) |
3246 | 3273 | @execBegin |
3247 | 3274 | conffile=~/.installer.conf |
3275 | +[ -e $conffile ] && return | |
3248 | 3276 | cat > $conffile << _EOF |
3249 | 3277 | # |
3250 | 3278 | # openmamba installation file |
... | ... | @@ -3309,30 +3337,6 @@ |
3309 | 3337 | </stringlist> |
3310 | 3338 | </property> |
3311 | 3339 | </widget> |
3312 | - </widget> | |
3313 | - <widget class="Label"> | |
3314 | - <property name="name"> | |
3315 | - <cstring>installTopLabel</cstring> | |
3316 | - </property> | |
3317 | - <property name="geometry"> | |
3318 | - <rect> | |
3319 | - <x>70</x> | |
3320 | - <y>0</y> | |
3321 | - <width>490</width> | |
3322 | - <height>50</height> | |
3323 | - </rect> | |
3324 | - </property> | |
3325 | - <property name="font"> | |
3326 | - <font> | |
3327 | - <pointsize>16</pointsize> | |
3328 | - </font> | |
3329 | - </property> | |
3330 | - <property name="text"> | |
3331 | - <string>Installation in progress...</string> | |
3332 | - </property> | |
3333 | - <property name="alignment"> | |
3334 | - <set>AlignCenter</set> | |
3335 | - </property> | |
3336 | 3340 | </widget> |
3337 | 3341 | </widget> |
3338 | 3342 | <widget class="QWidget"> |
installer/installer.sh
... | ... | @@ -130,7 +130,7 @@ |
130 | 130 | echo $found_driver |
131 | 131 | return 0 |
132 | 132 | else |
133 | - return -1 | |
133 | + return 1 | |
134 | 134 | fi |
135 | 135 | } |
136 | 136 | |
... | ... | @@ -138,7 +138,7 @@ |
138 | 138 | |
139 | 139 | echo $"\ |
140 | 140 | openmamba installation script - version $VERSION |
141 | -Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it> | |
141 | +Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it> | |
142 | 142 | " |
143 | 143 | |
144 | 144 | dcop_write $"Starting installation..." 5 |
installer/po/es.po
... | ... | @@ -50,9 +50,9 @@ |
50 | 50 | |
51 | 51 | #: _from_rc.cc:12 |
52 | 52 | msgid "" |
53 | -"Copyright (c) 2007-2010 by Silvan Calarco\n" | |
53 | +"Copyright (c) 2007-2011 by Silvan Calarco\n" | |
54 | 54 | "Released under the terms of the GNU GPL v3 license" |
55 | -msgstr "Copyright (c) 2007-2010 by Silvan Calarco\n" | |
55 | +msgstr "Copyright (c) 2007-2011 by Silvan Calarco\n" | |
56 | 56 | "Expedido según los términos de la licencia GNU GPL v3" |
57 | 57 | |
58 | 58 | #: _from_rc.cc:14 |
installer/po/it.po
... | ... | @@ -49,9 +49,9 @@ |
49 | 49 | |
50 | 50 | #: _from_rc.cc:12 |
51 | 51 | msgid "" |
52 | -"Copyright (c) 2007-2010 by Silvan Calarco\n" | |
52 | +"Copyright (c) 2007-2011 by Silvan Calarco\n" | |
53 | 53 | "Released under the terms of the GNU GPL v3 license" |
54 | -msgstr "Copyright (c) 2007-2010 by Silvan Calarco\n" | |
54 | +msgstr "Copyright (c) 2007-2011 by Silvan Calarco\n" | |
55 | 55 | "Rilasciato secondo i termini della licenza GNU GPL v3" |
56 | 56 | |
57 | 57 | #: _from_rc.cc:14 |
58 | 58 | |
... | ... | @@ -590,11 +590,11 @@ |
590 | 590 | #: installer.sh:113 |
591 | 591 | msgid "" |
592 | 592 | "openmamba installation script - version $VERSION\n" |
593 | -"Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>\n" | |
593 | +"Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>\n" | |
594 | 594 | "" |
595 | 595 | msgstr "" |
596 | 596 | "script di installazione di openmamba - versione $VERSION\n" |
597 | -"Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>\n" | |
597 | +"Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>\n" | |
598 | 598 | "" |
599 | 599 | #: installer.sh:118 |
600 | 600 | msgid "Starting installation..." |