From f826f8c22d4377b320bf7f0ae3108089ff7e1570 Mon Sep 17 00:00:00 2001 From: Jean-Marie Renouard Date: Sun, 11 Jun 2023 11:50:56 -0400 Subject: [PATCH 1/2] separated script for FEATURES.md generation --- FEATURES.md | 18 ------------------ build/genFeatures.sh | 12 ++++++++++++ build/updateStaff.sh | 12 +++++------- 3 files changed, 17 insertions(+), 25 deletions(-) create mode 100644 build/genFeatures.sh diff --git a/FEATURES.md b/FEATURES.md index 5b78c1c..437e475 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -20,10 +20,8 @@ Features list for option: --feature (dev only) * get_all_vars * get_basic_passwords * get_file_contents -* get_fs_info * get_gcache_memory * get_http_cli -* get_kernel_info * get_log_file_real_path * get_opened_ports * get_os_release @@ -31,29 +29,13 @@ Features list for option: --feature (dev only) * get_pf_memory * get_process_memory * get_replication_status -* get_system_info -* get_tuning_info * get_wsrep_option * get_wsrep_options * goodprint * greenwrap * grep_file_contents * headerprint -* hr_bytes -* hr_bytes_rnd -* hr_num -* hr_raw * human_size -* infocmd -* infocmd_one -* infocmd_tab -* infoprint -* infoprintcmd -* infoprinthcmd -* infoprintml -* is_open_port -* is_remote() -* is_virtual_machine * log_file_recommendations * make_recommendations * mariadb_aria diff --git a/build/genFeatures.sh b/build/genFeatures.sh new file mode 100644 index 0000000..13f91bc --- /dev/null +++ b/build/genFeatures.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Update Feature list +( + echo -e "Features list for option: --feature (dev only)\n---\n\n" + grep -E '^sub ' ../mysqltuner.pl | \ + perl -pe 's/sub //;s/\s*\{//g'| \ + sort -n | \ + perl -pe 's/^/* /g' | \ + grep -vE '(is_|hr_|info)' +) > ../FEATURES.md + diff --git a/build/updateStaff.sh b/build/updateStaff.sh index c35cced..790902f 100644 --- a/build/updateStaff.sh +++ b/build/updateStaff.sh @@ -11,12 +11,10 @@ perl updateCVElist.pl dos2unix ../mysqltuner.pl # Update Feature list -( - echo -e "Features list for option: --feature (dev only)\n---\n\n" - grep -E '^sub ' ../mysqltuner.pl | perl -pe 's/sub //;s/\s*\{//g'| sort -n | perl -pe 's/^/* /g' -) > ../FEATURES.md +bash ./genFeatures.sh git add ../vulnerabilities.csv ../mysqltuner.pl ../USAGE.md ../FEATURES.md -#git commit -m 'Update Vulnerabilities list -#Indenting mysqltuner -#Update Usage information' +git commit -m 'Update Vulnerabilities list +Indenting mysqltuner +Update Usage information +Regenerate fetures list' From e86778b43bdf606e700df3740169810c8da26d00 Mon Sep 17 00:00:00 2001 From: Jean-Marie Renouard Date: Sun, 11 Jun 2023 12:09:10 -0400 Subject: [PATCH 2/2] Laste version with clean FEATURES.md list --- FEATURES.md | 53 -------------------------------------------- build/genFeatures.sh | 7 +++--- 2 files changed, 4 insertions(+), 56 deletions(-) diff --git a/FEATURES.md b/FEATURES.md index 437e475..f09b448 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -2,40 +2,11 @@ Features list for option: --feature (dev only) --- -* arr2hash -* badprint * calculations -* check_architecture -* check_metadata_perf -* check_storage_engines -* close_outputfile -* cmdprint * compare_tuner_version * cpu_cores * cve_recommendations -* debugprint -* dump_result -* file2array -* file2string -* get_all_vars -* get_basic_passwords -* get_file_contents -* get_gcache_memory -* get_http_cli -* get_log_file_real_path -* get_opened_ports -* get_os_release -* get_other_process_memory -* get_pf_memory -* get_process_memory -* get_replication_status -* get_wsrep_option -* get_wsrep_options -* goodprint -* greenwrap * grep_file_contents -* headerprint -* human_size * log_file_recommendations * make_recommendations * mariadb_aria @@ -46,7 +17,6 @@ Features list for option: --feature (dev only) * mariadb_threadpool * mariadb_tokudb * mariadb_xtradb -* memerror * merge_hash * mysql_databases * mysql_indexes @@ -63,32 +33,9 @@ Features list for option: --feature (dev only) * mysql_version_le * mysql_views * os_setup -* percentage * pretty_uptime -* prettyprint -* redwrap -* remove_cr -* remove_empty * security_recommendations -* select_array -* select_array_with_headers -* select_csv_file -* select_indexes_db -* select_one -* select_one_g -* select_routines_db -* select_str_g -* select_table_columns_db -* select_table_indexes_db -* select_tables_db -* select_triggers_db -* select_user_dbs -* select_views_db -* string2file -* subheaderprint * system_recommendations -* trim * update_tuner_version * validate_mysql_version * validate_tuner_version -* which diff --git a/build/genFeatures.sh b/build/genFeatures.sh index 13f91bc..3736fcf 100644 --- a/build/genFeatures.sh +++ b/build/genFeatures.sh @@ -2,11 +2,12 @@ # Update Feature list ( + export LANG=C echo -e "Features list for option: --feature (dev only)\n---\n\n" grep -E '^sub ' ../mysqltuner.pl | \ - perl -pe 's/sub //;s/\s*\{//g'| \ + perl -pe 's/sub //;s/\s*\{//g' | \ sort -n | \ perl -pe 's/^/* /g' | \ - grep -vE '(is_|hr_|info)' + grep -vE '(get_|close_|check_|memerror|human_size|string2file|file2|arr2|dump|which|percentage|trim|is_|hr_|info|print|select|wrap|remove_)' ) > ../FEATURES.md - +cat ../FEATURES.md