Skip to content

Commit

Permalink
Fixed various formatting and convention issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
kilo52 committed Jan 27, 2024
1 parent cc4c743 commit bae680d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion java/03_library_native_jni/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function process_files_lvl_2() {
# Create namespace directory layout and move source files
local dir_layout="";
dir_layout=$(echo "$var_namespace" |tr "." "/");
local path_ns_include="${var_project_dir}/src/main/include/$dir_layout/";
local path_ns_include="${var_project_dir}/src/main/include/${dir_layout}/";
local path_ns_native="${var_project_dir}/src/main/${c_or_cpp}/${dir_layout}/";
local path_ns_test="${var_project_dir}/src/test/${c_or_cpp}/${dir_layout}/";
mkdir -p "$path_ns_include";
Expand Down
10 changes: 5 additions & 5 deletions libinit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1639,7 +1639,7 @@ function _show_start_title() {
local has_addons_title=false;
if [ -n "$PROJECT_INIT_ADDONS_DIR" ]; then
if [ -r "${PROJECT_INIT_ADDONS_DIR}/title.txt" ]; then
_print_text_from_file "$PROJECT_INIT_ADDONS_DIR/title.txt";
_print_text_from_file "${PROJECT_INIT_ADDONS_DIR}/title.txt";
has_addons_title=true;
fi
fi
Expand Down Expand Up @@ -3748,7 +3748,7 @@ function load_var() {
for (( i=CURRENT_LVL_NUMBER; i>=0; --i )); do
if [ -r "${init_lvl}/${arg_file}" ]; then
# Read file content
var_content="$(cat ${init_lvl}/${arg_file})";
var_content="$(cat "${init_lvl}/${arg_file}")";
break;
fi
init_lvl="$(dirname "$init_lvl")";
Expand Down Expand Up @@ -3833,7 +3833,7 @@ function load_var_from_file() {
if [ -r "${init_lvl}/${arg_file}" ]; then
found=true;
# Read file content
var_value="$(cat ${init_lvl}/${arg_file})";
var_value="$(cat "${init_lvl}/${arg_file}")";
break;
fi
init_lvl="$(dirname "$init_lvl")";
Expand Down Expand Up @@ -4143,7 +4143,7 @@ function project_init_license() {
if [ -z "${all_file_ext[0]}" ]; then
_make_func_hl "project_init_license";
logW "No file extensions specified in the call" \
"to the $HYPERLINK_VALUE function.";
"to the $HYPERLINK_VALUE function.";
logW "Copyright header variables in source files will not be replaced.";
logW "Please specify in the call to the project_init_license() function all file";
logW "extensions of project source files for which copyright headers exist";
Expand Down Expand Up @@ -4884,7 +4884,7 @@ function proceed_next_level() {
fi
fi
# Set global vars to new values
CURRENT_LVL_PATH="${CURRENT_LVL_PATH}/$dir_next";
CURRENT_LVL_PATH="${CURRENT_LVL_PATH}/${dir_next}";
CURRENT_LVL_NUMBER=$((CURRENT_LVL_NUMBER + 1));
declare SCRIPT_LVL_${CURRENT_LVL_NUMBER}_BASE="$CURRENT_LVL_PATH";

Expand Down
2 changes: 1 addition & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ run_funct=true;
if [[ $ARG_LINT == true ]]; then
if ! command -v "shellcheck" &> /dev/null; then
echo "Could not find command 'shellcheck'";
echo "Please make sure that Shellcheck is correctly installed";
echo "Please make sure that ShellCheck is correctly installed";
echo "See https://github.com/koalaman/shellcheck#installing";
exit 1;
fi
Expand Down

0 comments on commit bae680d

Please sign in to comment.