~aleteoryx/muditaos

96fa53d5213c24cb0fc322481e622904f05ffcbd — Burak 5 years ago 41eced2
[EGD-6559] Fix typos

Corrected typos in config/bootstrap.sh, config/format-config.sh,
config/license_header_check.sh, config/style_check_hook.sh and
in_docker.sh.
M config/bootstrap.sh => config/bootstrap.sh +4 -4
@@ 7,7 7,7 @@
#                   !!! WARNING !!!
#
# this script was written for `raw` ubuntu 18.10 64b
# optionaly consider installing ccache:
# optionally consider installing ccache:
#     `sudo apt install ccache`
# it's support is added to default ccache



@@ 24,7 24,7 @@ function test_if_run_as_root() {
    if [[ "${MY_NAME}" == "root" ]]; then
        cat <<-MSGEND
			Please do not run this script as a root.
			Script will ask for your password for taks it needs
			Script will ask for your password for tasks it needs
			to run as a root (sudo ...)
			MSGEND
        exit 1


@@ 52,7 52,7 @@ function install_hooks(){
    echo -e "\e[32m${FUNCNAME[0]}\e[0m"
    cat <<-MSGEND
		Install style checking hooks
		by default hook is reportin error only
		by default hook is reporting error only
		if you would like to make it automatically fix style errors add config "user.fixinstage" to your git configuration:
		    git config user.fixinstage true
		MSGEND


@@ 85,7 85,7 @@ function install_pip_packages() {
function install_ubuntu_packages() {
    echo -e "\e[32m${FUNCNAME[0]}\e[0m"
    cat <<-MSGEND
		# Install neccessary packages
		# Install necessary packages
		MSGEND
    echo "This will change your system, press CTRL+C if you do not want to install required packages, or press enter to continue..."
    read asdfasraewrawesjr

M config/format-config.sh => config/format-config.sh +2 -2
@@ 3,7 3,7 @@
# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

# config file for pre-commit.hook clang-format
# ignore file for clang-format autoformating
# ignore file for clang-format autoformatting

# set this variable in your shell if you wish to disable autoformatting on commit for time being
export DISABLE_AUTO_FORMATTING=0


@@ 11,7 11,7 @@ export DISABLE_AUTO_FORMATTING=0
# set this variable to get more verbose output
export VERBOSE=1

# ignore_paths for formatter - these are regex matched with filenames to be formated
# ignore_paths for formatter - these are regex matched with filenames to be formatted
# if you don't wish to format i.e one file - just pass whole path to this file from git root directory
export declare ignore_paths=(
    '.*/catch.hpp'

M config/license_header_check.sh => config/license_header_check.sh +1 -1
@@ 184,7 184,7 @@ function shouldnt_ignore() {
function help() {
    cat <<END
    check and update header files with copyright notice
    ussage:
    usage:
        $0 [--help | --check-only]
        $0 --hook [ --check-only]
                Run as git "pre-commith.hook", checks against files in stash

M config/style_check_hook.sh => config/style_check_hook.sh +2 -2
@@ 92,14 92,14 @@ check_file() {
function help() {
        echo "Runs clang-format on source files"
        cat <<- EOM
		ussge:
		usage:
		   $0 [option]
		        --about             does nothing
		        --last              checks current branch against origin/master - doesn't fix
		        --branch-fix        checks current branch against origin/master and fixes errors - you have to 'git add' and 'git commit' them
		        --fix               fix style in currently staged files (ignores user.fixinstage variale), this is usefull for manual style applying
		
		If you would like to automatially fix style before commit
		If you would like to automatically fix style before commit
		add to your git config "user.fixinstage" variable with value "True"
		by calling:
		    git config user.fixinstage True

M in_docker.sh => in_docker.sh +4 -4
@@ 18,11 18,11 @@ fi

function help() {
    cat <<- MSGEND
		This scripts runs configuration and build in docker container.
		This script runs configuration and builds in docker container.
		You don't have to setup entire build environment, just use container.
		 
		Ussage:
		${0} login|config|make [addiotional options]
		Usage:
		${0} login|config|make [additional options]
		 
		    login                                   - login to build container - usually not needed
		    config <target> <build_type> [OPTIONS]  - run ./configure.sh in container


@@ 30,7 30,7 @@ function help() {
		                                              OPTIONS are passed to cmake as is
		                                              run '${0} config' without params to see details
		    make|ninja <build_directory> [OPTIONS]        - run 'make' in container. You have to pass directory
		                                              creted by '${0} config' command.
		                                              created by '${0} config' command.
		                                              you can pass additional arguments for make linke '-j' or 'VERBOSE=1'
		MSGEND
    exit 0