Skip to content

Commit

Permalink
Update Libs and code cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
orkan committed Jan 10, 2020
1 parent 7450f02 commit bc97d7f
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 8 deletions.
22 changes: 18 additions & 4 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
Copyright 2019 Orkan <orkans@gmail.com>
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 <orkans@gmail.com>

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.
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.
2 changes: 1 addition & 1 deletion lib/orkan.lib.inc.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
6 changes: 3 additions & 3 deletions src/symlink.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bc97d7f

Please sign in to comment.