Skip to content

Commit

Permalink
Added .editorconfig, removed obsoleted upgrade.sh and main.sh, launch…
Browse files Browse the repository at this point in the history
…ing user_config function. (armbian#1543)
  • Loading branch information
psztoch authored and igorpecovnik committed Sep 7, 2019
1 parent cb91bf5 commit 202d2ca
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 35 deletions.
33 changes: 33 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

[*]
charset = utf-8
end_of_line = lf
indent_style = tab
indent_size = 8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
indent_style = space
indent_size = 4
trim_trailing_whitespace = false
insert_final_newline = false

# C coding style based on Linux kernel.
# https://www.kernel.org/doc/html/v5.0/process/coding-style.html

[*.sh]
indent_style = tab
indent_size = 4

[*.c]
indent_style = tab
indent_size = 8

[*.h]
indent_style = tab
indent_size = 8
5 changes: 5 additions & 0 deletions lib/configuration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,11 @@ if [[ -f $USERPATCHES_PATH/lib.config ]]; then
source "$USERPATCHES_PATH"/lib.config
fi

if [[ "$(type -t user_config)" == "function" ]]; then
display_alert "Invoke function with user override" "user_config" "info"
user_config
fi

# apt-cacher-ng mirror configurarion
if [[ $DISTRIBUTION == Ubuntu ]]; then
APT_MIRROR=$UBUNTU_MIRROR
Expand Down
34 changes: 0 additions & 34 deletions lib/upgrade.sh

This file was deleted.

1 change: 0 additions & 1 deletion main.sh

This file was deleted.

0 comments on commit 202d2ca

Please sign in to comment.