equal
deleted
inserted
replaced
73 else if (File.read(etc_settings).startsWith("# generated by Isabelle")) { |
73 else if (File.read(etc_settings).startsWith("# generated by Isabelle")) { |
74 etc_settings.file.delete; true |
74 etc_settings.file.delete; true |
75 } |
75 } |
76 else false |
76 else false |
77 |
77 |
78 def init_settings(components_base: String, nonfree: Boolean, more_settings: List[String]) |
78 def init_settings(components_base: String, more_settings: List[String]) |
79 { |
79 { |
80 if (!clean_settings()) |
80 if (!clean_settings()) |
81 error("Cannot proceed with existing user settings file: " + etc_settings) |
81 error("Cannot proceed with existing user settings file: " + etc_settings) |
82 |
82 |
83 Isabelle_System.mkdirs(etc_settings.dir) |
83 Isabelle_System.mkdirs(etc_settings.dir) |
89 { |
89 { |
90 val components_base_path = |
90 val components_base_path = |
91 if (components_base == "") isabelle_home_user.dir + Path.explode("contrib") |
91 if (components_base == "") isabelle_home_user.dir + Path.explode("contrib") |
92 else Path.explode(components_base).expand |
92 else Path.explode(components_base).expand |
93 |
93 |
94 val catalogs = |
94 val catalogs = List("main", "optional") |
95 if (nonfree) List("main", "optional", "nonfree") else List("main", "optional") |
|
96 |
|
97 catalogs.map(catalog => |
95 catalogs.map(catalog => |
98 "init_components " + File.bash_path(components_base_path) + |
96 "init_components " + File.bash_path(components_base_path) + |
99 " \"$ISABELLE_HOME/Admin/components/" + catalog + "\"") |
97 " \"$ISABELLE_HOME/Admin/components/" + catalog + "\"") |
100 } |
98 } |
101 |
99 |