From 07fbcf11a78d2ee20697eb98f5b7eeaa2475f1d1 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Tue, 16 Apr 2024 00:26:44 -0400 Subject: [PATCH] improve licensing --- README | 23 +++++++++++++++++++++++ brc2 | 36 +++++++++++++++++++++++++++++++++++- btrbk-run | 25 +++++++++++++++---------- distro-end | 20 ++++++++++++++++++-- mail-setup | 20 ++++++++++++++++++-- 5 files changed, 109 insertions(+), 15 deletions(-) diff --git a/README b/README index a4a6885..a5a83f9 100644 --- a/README +++ b/README @@ -1,3 +1,23 @@ +# I follow the GNU license recommendations, +# https://www.gnu.org/licenses/license-recommendations.en.html, which +# recommends that small programs, < 300 lines, such those contained in +# this file or related to this file, be licensed Apache License 2.0. Any +# program which grows large enough, I will switch it to GPL. + +# Copyright 2024 Ian Kelling + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + ~4k loc bash, configs for my computers Initial os install is also automated using a separate repo called @@ -32,5 +52,8 @@ lots of things), and has things you don't want to backup. So, you could use a subdirectory. But typing /s is much faster than ~/s and in every root context, /home/username/s. +The license of each file is specified in the header. There is no +overarching license. + Please email me if you have a patches, bugs, feedback, or republish this somewhere else: Ian Kelling . diff --git a/brc2 b/brc2 index 1c57452..a13574b 100644 --- a/brc2 +++ b/brc2 @@ -484,7 +484,7 @@ _iki-convert() { # can guess based on the existence of the file. We can't be sure # because it could be a file like x.jpg, that we just don't have # in our local repo. - elif [[ ! -f $path && -e $path.mdwn ]]; then + elif [[ ! -f $path && -e $path.mdwn ]]; then path=${path}.mdwn fi j printf "%s\n" "$path" @@ -1975,6 +1975,40 @@ capache() fi } +# wip +apache-apply() { + for file; do + if head -n1 "$file"| grep -E '^#!/bin/bash\b' &>/dev/null; then + { + head -n1 "$file" + cat <<'EOF' +# I follow the GNU license recommendations, +# https://www.gnu.org/licenses/license-recommendations.en.html, which +# recommends that small programs, < 300 lines, such those contained in +# this file or related to this file, be licensed Apache License 2.0. Any +# program which grows large enough, I will switch it to GPL. + +# Copyright 2024 Ian Kelling + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +EOF + tail -n+2 "$file" + } | sponge "$file" + fi + done +} + chrome() { if type -p chromium &>/dev/null; then cmd=chromium diff --git a/btrbk-run b/btrbk-run index 75a6f26..70fc704 100644 --- a/btrbk-run +++ b/btrbk-run @@ -1,17 +1,22 @@ #!/bin/bash -# Copyright (C) 2016 Ian Kelling -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# Configure & run btrbk & related work on Ian's computers. +# Copyright (C) 2024 Ian Kelling -# http://www.apache.org/licenses/LICENSE-2.0 +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# SPDX-License-Identifier: GPL-3.0-or-later # todo: if we cancel in the middle of a btrfs send, then run again diff --git a/distro-end b/distro-end index e5770d4..805b512 100755 --- a/distro-end +++ b/distro-end @@ -1,6 +1,22 @@ #!/bin/bash -# Copyright (C) 2019 Ian Kelling -# SPDX-License-Identifier: AGPL-3.0-or-later + +# Program to setup Ian's computers +# Copyright (C) 2024 Ian Kelling + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# SPDX-License-Identifier: GPL-3.0-or-later # shellcheck source=/a/bin/ds/.bashrc export LC_USEBASHRC=t; if [[ -s ~/.bashrc ]]; then . ~/.bashrc; fi diff --git a/mail-setup b/mail-setup index a684760..08ec7ae 100755 --- a/mail-setup +++ b/mail-setup @@ -1,7 +1,23 @@ #!/bin/bash # * intro -# Copyright (C) 2019 Ian Kelling -# SPDX-License-Identifier: AGPL-3.0-or-later + +# Program to install and configure Ian's email related programs +# Copyright (C) 2024 Ian Kelling + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# SPDX-License-Identifier: GPL-3.0-or-later # todo: # on bk (and fsf servers that run multiple exim4 daemons, eg eximfsf2 and eximfsf3), -- 2.30.2