diff --git a/LICENSE.md b/LICENSE.md index 9b7a96b..d582aac 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,21 @@ -Copyright 2019 Orkan +MIT License -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +Copyright 2020 Orkan -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/lib/orkan.lib.inc.ahk b/lib/orkan.lib.inc.ahk index 1014047..cb3775a 100644 --- a/lib/orkan.lib.inc.ahk +++ b/lib/orkan.lib.inc.ahk @@ -20,7 +20,7 @@ merge_from_ini(obj, name) { ; same numeric and string keys gets overwriten object_merge(o1, o2) { for, key, val in o2 - o1[key] := IsObject(val) ? object_merge(o1[key], val) : val + o1[key] := IsObject(val) ? object_merge(IsObject(o1[key]) ? o1[key] : [], val) : val return o1 } diff --git a/src/symlink.ahk b/src/symlink.ahk index 12a70f2..ac52d7e 100644 --- a/src/symlink.ahk +++ b/src/symlink.ahk @@ -11,10 +11,10 @@ base_url := "https://github.com/orkan/symlink" version := get_version(git_version) ; user settings - overwrites symlink.def.inc.ahk -name_ini := base_name . ".ini" -ini := merge_from_ini(ini, name_ini) +name_ini := base_name ".ini" +ini := merge_from_ini(ini, name_ini) ; user lang - overwrites symlink.lang.inc.ahk -lang_ini := base_name . ".lang." . ini.wnd.lang . ".ini" +lang_ini := base_name ".lang." ini.wnd.lang ".ini" lang := merge_from_ini(lang, lang_ini) edW := 478 ; initial edit width