use new botm common lib as external dependency, not submodule

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644 (file)
index 18429c3..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "botm-common"]
-       path = botm-common
-       url = ../../botm/common-perl

diff --git a/2words.1.pl b/2words.1.pl
index 6148f29796644739f4516a6d092c72a4a98f5433..6ca74f3c2f773ae9a5a1807414d9b885f8c9616b 100644 (file)
--- a/2words.1.pl
+++ b/2words.1.pl
@@ -5,7 +5,7 @@
 #
 # The wordgame interface
 #
-# Copyright (C) 2016, 2017, 2023, 2024  Balthasar Szczepański
+# Copyright (C) 2016, 2017, 2023, 2024, 2026  Balthasar Szczepański
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -25,17 +25,26 @@ use utf8;
 # use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+###PERL_LIB:        use lib /botm/lib/bsta
+use botm_system (
+       'open_encoded'
+);
+use botm_url (
+       'merge_url',
+       'url_query_decode', 'url_query_encode'
+);
+use botm_http (
        'HTTP_STATUS',
-       'merge_settings',
        'fail_method', 'fail_content_type',
        'http_header_status', 'http_header_allow',
-       'merge_url',
-       'read_header_env',
-       'html_entity_encode_dec',
-       'url_query_decode', 'url_query_encode',
-       'open_encoded'
+       'read_header_env'
+);
+use botm_data_file (
+       'merge_settings'
+);
+use botm_html_encode (
+       'html_entity_encode_dec'
 );
 use bsta_lib (
        'STATE', 'INTF_STATE',

diff --git a/attach.1.pl b/attach.1.pl
index 23c003c1ccafe679813bbc235dcd3660d74a911e..91520bc85eb80a8ccedffc6dbdd802f74d225bf4 100644 (file)
--- a/attach.1.pl
+++ b/attach.1.pl
@@ -5,7 +5,7 @@
 #
 # The attachment interface
 #
-# Copyright (C) 2016, 2023, 2024  Balthasar Szczepański
+# Copyright (C) 2016, 2023, 2024, 2026  Balthasar Szczepański
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -25,19 +25,27 @@ use utf8;
 # use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+###PERL_LIB:        use lib /botm/lib/bsta
+use botm_system (
+       'join_path',
+       'open_encoded', 'stat_encoded'
+);
+use botm_url (
+       'url_query_decode',
+       'merge_url'
+);
+use botm_http (
        'HTTP_STATUS',
-       'merge_settings',
        'fail_method', 'fail_content_type', 'fail_attachment', 'fail_500',
        'redirect',
        'read_header_env',
-       'url_query_decode',
-       'join_path',
-       'merge_url',
-       'open_encoded', 'stat_encoded',
        'http_header_line', 'http_header_content_length', 'http_header_content_disposition'
 );
+use botm_data_file (
+       'merge_settings'
+);
+
 use bsta_lib (
        'STATE',
        'get_id', 'get_password',

diff --git a/bbcode.1.pl b/bbcode.1.pl
index 04a0ff4e89ded354973bb29db4103d6390be966b..403af265b2e937c40b1917df69ac4c543a47bf93 100644 (file)
--- a/bbcode.1.pl
+++ b/bbcode.1.pl
@@ -5,7 +5,7 @@
 #
 # The bbcode interface
 #
-# Copyright (C) 2017, 2023, 2024  Balthasar Szczepański
+# Copyright (C) 2017, 2023, 2024, 2026  Balthasar Szczepański
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -25,14 +25,19 @@ use utf8;
 # use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+###PERL_LIB:        use lib /botm/lib/bsta
+use botm_url (
+       'url_query_decode',
+       'merge_url'
+);
+use botm_http (
        'HTTP_STATUS',
        'fail_method', 'fail_content_type',
        'read_header_env',
-       'url_query_decode',
-       'merge_url',
-       'http_header_status',
+       'http_header_status'
+);
+use botm_data_file (
        'merge_settings'
 );
 use bsta_lib (

diff --git a/botm-common b/botm-common
deleted file mode 160000 (submodule)
index b3ffb0f..0000000
--- a/botm-common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b3ffb0f0c3c240103a57c98c930d806f748f05a1

diff --git a/bsta_lib.1.pm b/bsta_lib.1.pm
index a7820b09b34cb5692dfc3c9ba51ce11d033d1751..244cefe110e465b6aedd17c66c3d67bcbe835b77 100644 (file)
--- a/bsta_lib.1.pm
+++ b/bsta_lib.1.pm
@@ -54,21 +54,29 @@ our @EXPORT_OK   = (
        'eval_bb', 'bb_to_bbcode', 'bb_to_html'
 );
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
-       'HTTP_STATUS',
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+use botm_system (
+       'join_path',
+       'copy_encoded', 'open_encoded', '_x_encoded',
+);
+use botm_url (
        'url_query_decode', 'url_query_encode',
        'url_decode', 'url_encode',
-       'html_entity_encode_dec',
-       'merge_url',
+       'merge_url'
+);
+use botm_http (
+       'HTTP_STATUS',
        'read_header_env',
-       'read_data_file', 'write_data_file',
-       'join_path',
-       'copy_encoded', 'open_encoded', '_x_encoded',
        'http_header_line', 'http_status',
        'http_header_status', 'http_header_allow', 'http_header_location',
+);
+use botm_data_file (
+       'read_data_file', 'write_data_file',
        'merge_settings'
 );
+use botm_html_encode (
+       'html_entity_encode_dec'
+);
 
 ###PERL_PATH_SEPARATOR:     PATH_SEPARATOR     = /
 

diff --git a/chat.1.pl b/chat.1.pl
index ca787d40e665d75b32752062be537c4baf851a53..4059ff0de2954c1e78805d14e60bb61ce25a872a 100644 (file)
--- a/chat.1.pl
+++ b/chat.1.pl
@@ -5,7 +5,7 @@
 #
 # The coincidence interface
 #
-# Copyright (C) 2016, 2017, 2023, 2024, 2025  Balthasar Szczepański
+# Copyright (C) 2016, 2017, 2023, 2024, 2025, 2026  Balthasar Szczepański
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -26,18 +26,27 @@ use utf8;
 # use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+###PERL_LIB:        use lib /botm/lib/bsta
+use botm_system (
+       'open_encoded'
+);
+use botm_url (
+       'url_query_decode', 'url_query_encode',
+       'merge_url'
+);
+use botm_http (
        'HTTP_STATUS',
        'fail_method', 'fail_content_type',
        'read_header_env',
-       'url_query_decode', 'url_query_encode',
-       'merge_url',
-       'html_entity_encode_dec',
-       'open_encoded',
-       'http_header_status',
+       'http_header_status'
+);
+use botm_data_file (
        'merge_settings'
 );
+use botm_html_encode (
+       'html_entity_encode_dec'
+);
 use bsta_lib (
        'STATE', 'CHAT_STATE', 'CHAT_ACTION',
        'get_remote_addr', 'get_id', 'get_password',

diff --git a/frame.1.pl b/frame.1.pl
index 60595ae0b052dd1e92300024afe455efaec60ac4..0ecb91e27a4be59ad2938d3e9d252aa9196561a3 100644 (file)
--- a/frame.1.pl
+++ b/frame.1.pl
@@ -5,7 +5,7 @@
 #
 # The frame interface
 #
-# Copyright (C) 2016, 2023, 2024  Balthasar Szczepański
+# Copyright (C) 2016, 2023, 2024, 2026  Balthasar Szczepański
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -25,16 +25,23 @@ use utf8;
 # use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+###PERL_LIB:        use lib /botm/lib/bsta
+use botm_system (
+       'join_path',
+       'open_encoded', 'stat_encoded'
+);
+use botm_url (
+       'url_query_decode',
+       'merge_url'
+);
+use botm_http (
        'HTTP_STATUS',
        'fail_method', 'fail_content_type', 'fail_open_file', 'fail_500', 'redirect',
        'read_header_env',
-       'url_query_decode',
-       'join_path',
-       'merge_url',
-       'open_encoded', 'stat_encoded',
-       'http_header_line', 'http_header_content_length', 'http_header_content_disposition',
+       'http_header_line', 'http_header_content_length', 'http_header_content_disposition'
+);
+use botm_data_file (
        'merge_settings'
 );
 use bsta_lib (

diff --git a/goto.1.pl b/goto.1.pl
index 26eef98e2214ae4248e39ecfebf1a7cc33656cf2..5d8d738f0710485ee8edee7aee0f42c9ae77c588 100644 (file)
--- a/goto.1.pl
+++ b/goto.1.pl
@@ -5,7 +5,7 @@
 #
 # The frame list
 #
-# Copyright (C) 2017, 2023, 2024  Balthasar Szczepański
+# Copyright (C) 2017, 2023, 2024, 2026  Balthasar Szczepański
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -25,13 +25,20 @@ use utf8;
 # use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+###PERL_LIB:        use lib /botm/lib/bsta
+use botm_system (
+       '_x_encoded'
+);
+use botm_url (
+       'url_query_decode'
+);
+use botm_http (
        'fail_method', 'fail_content_type',
        'redirect',
-       'read_header_env',
-       'url_query_decode',
-       '_x_encoded',
+       'read_header_env'
+);
+use botm_data_file (
        'merge_settings'
 );
 use bsta_lib (

diff --git a/info.1.pl b/info.1.pl
index 58a675fc51381708ecc28dd61556ccd33c189b99..7d04e9d779974a1ee74be3c0a0a8b4da5101ea72 100644 (file)
--- a/info.1.pl
+++ b/info.1.pl
@@ -5,7 +5,7 @@
 #
 # The frame/story info interface
 #
-# Copyright (C) 2017, 2023, 2024  Balthasar Szczepański
+# Copyright (C) 2017, 2023, 2024, 2026  Balthasar Szczepański
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -25,14 +25,19 @@ use utf8;
 # use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+###PERL_LIB:        use lib /botm/lib/bsta
+use botm_url (
+       'url_query_decode'
+);
+use botm_http (
        'HTTP_STATUS',
        'fail_method', 'fail_content_type',
        'http_header_status',
-       'read_header_env',
+       'read_header_env'
+);
+use botm_data_file (
        'write_data_file',
-       'url_query_decode',
        'merge_settings'
 );
 use bsta_lib (

diff --git a/makefile b/makefile
index 5ae746867d347f3dace106b95c3ba3617ea8f9e4..697d748b72f2add74b1795d72705f23fcc08886e 100644 (file)
--- a/makefile
+++ b/makefile
@@ -146,7 +146,6 @@ $(EXEC)\
 $(PERL_WRAP_EXEC)
 
 LIB=\
-botm-common/botm_common.pm\
 bsta_lib.pm
 
 WWW=\

diff --git a/makefile.1.mak b/makefile.1.mak
index d811fdf727d39d78025ee52df4bbdfa74b3cdf6e..1f9270a4c0776ae3dfea0bb36127b90e8e31af7b 100644 (file)
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -146,7 +146,6 @@ $(EXEC)\
 $(PERL_WRAP_EXEC)
 
 LIB=\
-botm-common/botm_common.pm\
 bsta_lib.pm
 
 WWW=\

diff --git a/ong.1.pl b/ong.1.pl
index 2855d687e310dc6042b74cf556074578ccb5d215..49a93fb285589c6c62be94184935c01f2029cacb 100644 (file)
--- a/ong.1.pl
+++ b/ong.1.pl
@@ -24,9 +24,10 @@ use utf8;
 # use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
-       'open_encoded',
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+###PERL_LIB:        use lib /botm/lib/bsta
+use botm_system (
+       'open_encoded'
 );
 use bsta_lib (
        'STATE',

diff --git a/opomba.1.pl b/opomba.1.pl
index 26cdaa54d2697be34f658256c0adcf80960f59ef..eb67cfb6ba45ba3431738dcaa1098b814b4eb5cf 100644 (file)
--- a/opomba.1.pl
+++ b/opomba.1.pl
@@ -5,7 +5,7 @@
 #
 # The comment posting interface
 #
-# Copyright (C) 2024, 2025  Balthasar Szczepański
+# Copyright (C) 2024, 2025, 2026  Balthasar Szczepański
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -25,21 +25,31 @@ use utf8;
 # use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
-       'HTTP_STATUS',
-       'fail_method', 'fail_content_type',
-       'redirect',
-       'read_header_env', 'url_query_decode',
-       'write_data_file',
-       'html_entity_encode_dec',
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+###PERL_LIB:        use lib /botm/lib/bsta
+use botm_system (
        'open_encoded',
        'join_path',
-       'merge_settings',
+       'make_id'
+);
+use botm_url (
        'merge_url',
-       'make_id',
+       'url_query_decode',
+);
+use botm_http (
+       'HTTP_STATUS',
+       'fail_method', 'fail_content_type',
+       'redirect',
+       'read_header_env',
        'http_header_status'
 );
+use botm_data_file (
+       'write_data_file',
+       'merge_settings'
+);
+use botm_html_encode (
+       'html_entity_encode_dec'
+);
 use bsta_lib (
        'TEXT_MODE', 'STATE',
        'get_password',

diff --git a/reset.1.pl b/reset.1.pl
index b4fe66579f717818212ad06d22537faae98ea531..4a21a119318286d1d37f7c470baaf93c8ac9ab4b 100644 (file)
--- a/reset.1.pl
+++ b/reset.1.pl
@@ -24,11 +24,14 @@ use utf8;
 use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
-       'write_data_file',
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+###PERL_LIB:        use lib /botm/lib/bsta
+use botm_system (
        'opendir_encoded', 'readdir_decoded', 'unlink_encoded',
-       'join_path',
+       'join_path'
+);
+use botm_data_file (
+       'write_data_file',
        'merge_settings'
 );
 use bsta_lib (

diff --git a/settings-again.txt b/settings-again.txt
index 24319d390e1800ebc530fd0e6884ef67cbf4e3a3..ef0cb6a50aaa4a47c6294595eaad4f08dc84d5a6 100644 (file)
--- a/settings-again.txt
+++ b/settings-again.txt
@@ -54,9 +54,10 @@ perl : /usr/bin/perl
 rm   : /usr/bin/rm
 sudo : /usr/bin/sudo
 
-oldlogs  : /botm/bin/oldlogs/oldlogs.pl
-configure: /botm/bin/config-1.3/configure.pl
-exec     : /botm/lib/exec
+oldlogs    : /botm/bin/oldlogs/oldlogs.pl
+configure  : /botm/bin/config-1.3/configure.pl
+exec       : /botm/lib/exec
+botm_common: /botm/lib/botm-common-perl-2.0
 
 CC: /usr/bin/gcc
 CF: -g -Wall

diff --git a/settings-bsta.txt b/settings-bsta.txt
index e89076eba9bbd684820c3cdc1db997245adb64df..feb236ec29d84e089a05d0d159b4af40fd240882 100644 (file)
--- a/settings-bsta.txt
+++ b/settings-bsta.txt
@@ -54,9 +54,10 @@ perl : /usr/bin/perl
 rm   : /usr/bin/rm
 sudo : /usr/bin/sudo
 
-oldlogs  : /botm/bin/oldlogs/oldlogs.pl
-configure: /botm/bin/config-1.3/configure.pl
-exec     : /botm/lib/exec
+oldlogs    : /botm/bin/oldlogs/oldlogs.pl
+configure  : /botm/bin/config-1.3/configure.pl
+exec       : /botm/lib/exec
+botm_common: /botm/lib/botm-common-perl-2.0
 
 CC: /usr/bin/gcc
 CF: -g -Wall

diff --git a/settings-debug.txt b/settings-debug.txt
index 76c2265248dcafbf6374cff766ac16a62050b1bc..4f18258b826fead25bc2e27bc2f6487209b164bd 100644 (file)
--- a/settings-debug.txt
+++ b/settings-debug.txt
@@ -54,9 +54,10 @@ perl : /usr/bin/perl
 rm   : /usr/bin/rm
 sudo : /usr/bin/sudo
 
-oldlogs  : /botm/bin/oldlogs/oldlogs.pl
-configure: /botm/bin/config-1.3/configure.pl
-exec     : /botm/lib/exec
+oldlogs    : /botm/bin/oldlogs/oldlogs.pl
+configure  : /botm/bin/config-1.3/configure.pl
+exec       : /botm/lib/exec
+botm_common: /botm/lib/botm-common-perl-2.0
 
 CC: /usr/bin/gcc
 CF: -g -Wall

diff --git a/settings.txt b/settings.txt
index 626e90b04350bfd4268ee3f2d95b76b75fb97b08..e28e1c17a8d1a46a0f56a958cf72ec34929d6273 100644 (file)
--- a/settings.txt
+++ b/settings.txt
@@ -157,7 +157,8 @@ MAKE_EXEC_C        = EXEC_C        = $_exec_c
 MAKE_EXEC_SETTINGS = EXEC_SETTINGS = $_exec_settings
 
 
-PERL_LIB = @_PERL_USE_2(lib, @_PERL_STR($lib_path))
+PERL_LIB        = @_PERL_USE_2(lib, @_PERL_STR($lib_path   ))
+PERL_LIB_COMMON = @_PERL_USE_2(lib, @_PERL_STR($botm_common))
 
 PERL_SET_PATH = \$ENV{'PATH'} = @_PERL_STR($path);
 

diff --git a/update.1.pl b/update.1.pl
index 1397e7c9b4d8c0e3f2d0fde508b575b5cb0b2806..b2704e6f787aab13a57b30c3efa63893edc7906a 100644 (file)
--- a/update.1.pl
+++ b/update.1.pl
@@ -4,7 +4,7 @@
 #
 # update already ONGed frames & stuff
 #
-# Copyright (C) 2016, 2017, 2023, 2024, 2025  Balthasar Szczepański
+# Copyright (C) 2016, 2017, 2023, 2024, 2025, 2026  Balthasar Szczepański
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -25,8 +25,6 @@ use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
 ###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
-);
 use bsta_lib (
        'STATE',
        'ong',

diff --git a/viewer.1.pl b/viewer.1.pl
index f0ed2c2524dd6832b42029dbdd9c9ffe5b3c3588..6c335c7dd41c9347b11bb45d84971c6508940aca 100644 (file)
--- a/viewer.1.pl
+++ b/viewer.1.pl
@@ -5,7 +5,7 @@
 #
 # The viewer interface
 #
-# Copyright (C) 2016, 2017, 2019, 2020, 2023, 2024  Balthasar Szczepański
+# Copyright (C) 2016, 2017, 2019, 2020, 2023, 2024, 2026  Balthasar Szczepański
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -25,17 +25,24 @@ use utf8;
 # use Encode::Locale ('decode_argv');
 use Encode ('encode', 'decode');
 
-###PERL_LIB: use lib /botm/lib/bsta
-use botm_common (
+###PERL_LIB_COMMON: use lib /botm/lib/botm-common-perl-2.0
+###PERL_LIB:        use lib /botm/lib/bsta
+use botm_system (
+       'join_path',
+       'open_encoded', '_x_encoded',
+);
+use botm_url (
+       'merge_url',
+       'url_query_decode'
+);
+use botm_http (
        'HTTP_STATUS',
        'fail_method', 'fail_content_type', 'redirect',
        'read_header_env',
-       'url_query_decode',
-       'join_path',
-       'open_encoded', '_x_encoded',
-       'http_header_status',
-       'merge_settings',
-       'merge_url'
+       'http_header_status'
+);
+use botm_data_file (
+       'merge_settings'
 );
 use bsta_lib (
        'STATE', 'TEXT_MODE', 'INTF_STATE',