diff options
| author | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
| commit | 0703404654d2a40cacae2d94c6e0e22ca28b4acf (patch) | |
| tree | bfdbe1e8952814f73a6b0e190ae0a77fd0cfc7bd /amiga/dist/Install | |
| parent | 54f719aa960159c5b1978846223732c9669ca7fa (diff) | |
| parent | 89856f55929907642013e45435b9d18cd1fafe36 (diff) | |
| download | netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.gz netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.bz2 | |
Merge branch 'master' into mono/removing-windom-dependencymono/removing-windom-dependency
Conflicts:
atari/toolbar.c
Diffstat (limited to 'amiga/dist/Install')
| -rwxr-xr-x | amiga/dist/Install | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/amiga/dist/Install b/amiga/dist/Install index e32096498..01914294b 100755 --- a/amiga/dist/Install +++ b/amiga/dist/Install @@ -382,6 +382,10 @@ (set #user-options (tackon #user-dir "Choices")) (set #options-exist (exists #user-options)) (set #searchengines-exist (exists (tackon @default-dest "Resources/SearchEngines"))) +(set #user-hotlist (tackon #user-dir "Hotlist")) +(set #hotlist-exist (exists #user-hotlist)) +(set #old-hotlist (tackon @default-dest "Resources/Hotlist")) +(set #old-hotlist-exist (exists #old-hotlist)) (set #aiss-theme "") (if (= #options-exist 0) @@ -411,6 +415,20 @@ ) ) +(if (= #hotlist-exist 0) + (if (= #old-hotlist-exist 1) + ( + (copyfiles + (prompt "Migrating NetSurf 2.x Hotlist") + (help @copyfiles-help) + (source #old-hotlist) + (dest #user-dir) + (optional "askuser" "force" "oknodelete") + ) + ) + ) +) + (complete 18) (if (>= osver 53) |