Added .editorconfig, removed obsoleted upgrade.sh and main.sh, launching user_config function. (#1543)

This commit is contained in:
Przemysław Sztoch 2019-09-07 23:28:42 +02:00 committed by Igor Pečovnik
parent cb91bf593c
commit 202d2cac81
4 changed files with 38 additions and 35 deletions

33
.editorconfig Normal file
View file

@ -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

View file

@ -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

View file

@ -1,34 +0,0 @@
#!/bin/bash
# Copyright (c) 2015-2017 Igor Pecovnik, igor.pecovnik@gma**.com
# Copyright (c) 2015-2017 other Armbian contributors (https://github.com/armbian/build/graphs/contributors)
#
# This file is licensed under the terms of the GNU General Public
# License version 2. This program is licensed "as is" without any
# warranty of any kind, whether express or implied.
#
# This file is part of the Armbian build script https://github.com/armbian/build/
# Show info messages about changed directory structure
# when updating from older build script versions
TTY_X=$(($(stty size | awk '{print $2}')-6)) # determine terminal width
TTY_Y=$(($(stty size | awk '{print $1}')-6)) # determine terminal height
if [[ $(basename "$0") == main.sh ]]; then
echo "Please use compile.sh to start the build process"
exit 255
fi
if [[ $(basename "$0") == compile.sh ]]; then
# assuming dialog was installed already since this is supposed to be shown only on upgrade from previous versions
dialog --title "Directory structure change notice" --colors --msgbox "Build script directory structure was changed to simplify the build environment setup, \
simplify upgrading in the future and improve compatibility with containers like Docker and Vagrant
To upgrade please clone the repository \Z4https://github.com/armbian/build/\Zn into an empty directory and launch \Z2compile.sh\Zn
Copying and editing compile.sh is not required, build configuration is defined in \Z1config-*.conf\Zn files
Default build configuration is defined in \Z1config-default.conf\Zn (created on first build script run)
Sorry for the inconvenience" $TTY_Y $TTY_X
exit 255
fi

View file

@ -1 +0,0 @@
lib/upgrade.sh