diff --git a/README.md b/README.md index 0f96ea2..fa354f7 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,17 @@ This is a collection of /etc/profile.d files used by the gwebu team. Unless explicitly stated in the file itself, the license is [The Unlicense](https://choosealicense.com/licenses/unlicense/). + +## Hooks + +Create the following hook in your local repository to update the RPM changelog for you: + + +```bash +echo '#!/usr/bin/env bash + +set -eu + +./changelog.sh' > .git/hooks/post-commit +chmod a+x .git/hooks/post-commit +``` diff --git a/changelog.sh b/changelog.sh index 5107716..5dc8f29 100755 --- a/changelog.sh +++ b/changelog.sh @@ -1,4 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash + +set -euo pipefail +shopt -s nullglob dotglob ver=$(git describe --dirty --long --match='v[0-9]*.[0-9]*' | cut -c 2- | cut -d - -f 1,2,4) rpm_ver="${ver%%-*}" @@ -14,3 +17,7 @@ awk -v change="${change}" '/^%changelog/ {print; print change; next} 1' gwebu-pr sed -i "s/Version: .*/Version: ${rpm_ver}/" gwebu-profile.spec.in sed -i "s/Release: .*/Release: ${rpm_numeric_rev}/" gwebu-profile.spec.in + +git add gwebu-profile.spec.in + +echo "gwebu-profile.spec.in changelog updated" diff --git a/etc/profile.d/ssh_controlmasters.sh b/etc/profile.d/ssh_controlmasters.sh new file mode 100755 index 0000000..5a76d40 --- /dev/null +++ b/etc/profile.d/ssh_controlmasters.sh @@ -0,0 +1,9 @@ +if [ "${BASH_SOURCE-}" = "$0" ]; then + echo -e "You must source this script:\n\tsource $0" >&2 + exit 33 +fi + +# SSH Control Masters tools (setup controlmasters to be in ~/.ssh/controlmasters). +alias ssh_controlmasters_ls='(cd ~/.ssh/controlmasters; ls -A 2>/dev/null || echo "-- No control masters --")' +alias ssh_controlmasters_check='(cd ~/.ssh/controlmasters; [ "$(ls -A)" ] && for i in *; do echo -n "$i: "; ssh -O check "${i%:*}" -p "${i##*:}"; done)' +alias ssh_controlmasters_stop='(cd ~/.ssh/controlmasters; [ "$(ls -A)" ] && for i in *; do echo -n "$i: "; ssh -O stop "${i%:*}" -p "${i##*:}"; done)' diff --git a/etc/profile.d/z-aliases.sh b/etc/profile.d/z-aliases.sh index 1d13aa3..ffd9259 100755 --- a/etc/profile.d/z-aliases.sh +++ b/etc/profile.d/z-aliases.sh @@ -6,7 +6,7 @@ fi # show hidden files and directories alias l.='ls -d .[^.]* ..?* --color=tty 2>/dev/null' -if ! which ll 2>/dev/null; then +if ! which ll >/dev/null 2>&1; then alias ll='ls -l --color=auto' fi diff --git a/gwebu-profile.spec.in b/gwebu-profile.spec.in index cee66fa..a03ddce 100644 --- a/gwebu-profile.spec.in +++ b/gwebu-profile.spec.in @@ -1,7 +1,7 @@ Summary: Gwebu profile.d - cool date, prompt with history, aliases Name: gwebu-profile Version: 1.0.2 -Release: 0 +Release: 6 BuildArch: noarch License: GPLv2 Source0: profile.d-%{version}-%{release}.tar.xz @@ -41,6 +41,26 @@ install -m 0644 etc/profile.d/*.sh %{buildroot}%{_sysconfdir}/profile.d/ %changelog +* Thu May 30 2024 Doncho N. Gunchev - 1.0.2-6 +- New shebang for changelog.sh, post-commit hook in README.md. + +* Thu May 30 2024 Doncho N. Gunchev - 1.0.2-6 + +* Thu May 30 2024 Doncho N. Gunchev - 1.0.2-5 +- Add ssh control masters management aliases. Silence a which. + +* Thu May 30 2024 Jorge Stefanov - 1.0.2-4 +- adjusted time format for lll + +* Tue May 14 2024 Doncho Gunchev - 1.0.2-3 +- Fix lll on MacOS. + +* Tue May 14 2024 Doncho Gunchev - 1.0.2-2 +- Add ls aliases for MacOS (ll, lll). + +* Fri Apr 26 2024 Doncho N. Gunchev - 1.0.2-1 +- Don't add ip aliases on MacOS. + * Fri Apr 26 2024 Doncho N. Gunchev - 1.0.2-0 - Let's be MacOS compatible.