Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/bin

Pascal J. Bourguignon [2021-08-04 09:46]
Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/bin
Filename
ec
git-groups
macosx-keychain
pjb-xterm
sanitize
diff --git a/ec b/ec
index ea20dba..9b9af79 100755
--- a/ec
+++ b/ec
@@ -15,4 +15,11 @@ for ec in /Applications/Emacs.app/Contents/MacOS/bin/emacsclient emacsclient ; d
     fi
 done
 echo "No emacsclient."
-( echo "Trying $VISUAL" ; "$VISUAL" "$@" ) || ( echo "Trying $EDITOR" ; "$EDITOR" "$@" )
+if [ "$VISUAL" != "ec" ] ; then
+    echo "Trying $VISUAL"
+    "$VISUAL" "$@"
+fi || \
+    if [ "$EDITOR" != "ec" ] ; then
+        echo "Trying $EDITOR"
+        "$EDITOR" "$@"
+    fi
diff --git a/git-groups b/git-groups
index d5b73b0..a8b8ccd 100755
--- a/git-groups
+++ b/git-groups
@@ -42,12 +42,12 @@ function print_gsets(){
 function usage(){
     printf "\n"
     printf "%s usage:\n\n" "$pname"
-    printf "  %s [-n|--dry-run] [-v|--verbose] links  # creates the associated symlinks.\n"  "git-group"
-    printf "  %s sets                                 # display the list of gsets.\n"        "git-group"
-    printf "  git-group stat [-n|--dry-run] [-v|--verbose] [gset]\n"
-    printf "  git-group pull [-n|--dry-run] [-v|--verbose] [gset] [--all-remotes]\n"
-    printf "  git-group push [-n|--dry-run] [-v|--verbose] [gset] [--all-remotes]\n"
-    printf "  git-group remotes [-n|--dry-run] [-v|--verbose] [gset]\n"
+    printf "  %s [-n|--dry-run] [-v|--verbose] links  # creates the associated symlinks.\n"  "git-groups"
+    printf "  %s sets                                 # display the list of gsets.\n"        "git-groups"
+    printf "  git-groups stat [-n|--dry-run] [-v|--verbose] [gset]\n"
+    printf "  git-groups pull [-n|--dry-run] [-v|--verbose] [gset] [--all-remotes]\n"
+    printf "  git-groups push [-n|--dry-run] [-v|--verbose] [gset] [--all-remotes]\n"
+    printf "  git-groups remotes [-n|--dry-run] [-v|--verbose] [gset]\n"
     printf "  gstat [-n|--dry-run] [-v|--verbose] [gset]\n"
     printf "  gpull [-n|--dry-run] [-v|--verbose] [gset] [--all-remotes]\n"
     printf "  gpush [-n|--dry-run] [-v|--verbose] [gset] [--all-remotes]\n"
diff --git a/macosx-keychain b/macosx-keychain
new file mode 100755
index 0000000..22d170c
--- /dev/null
+++ b/macosx-keychain
@@ -0,0 +1,2 @@
+#!/bin/bash
+open -a '/System/Applications/Utilities/Keychain Access.app'
diff --git a/pjb-xterm b/pjb-xterm
index 144b604..c1fd45e 100755
--- a/pjb-xterm
+++ b/pjb-xterm
@@ -31,7 +31,6 @@ green_3_fo=(-fn $conso_16_font )
 green_4_fo=(-fn $conso_17_font )
 green_5_fo=(-fn $intl_font )
 green_6_fo=(-fn $led_font )
-selected_font="$default_font"

 green_1_fo=(-fn '-bitstream-Bitstream Vera Sans Mono-normal-normal-normal-*-17-*-*-*-m-0-iso10646-1')
 green_2_fo=(-fn '-bitstream-Bitstream Vera Sans Mono-normal-normal-normal-*-19-*-*-*-m-0-iso10646-1')
@@ -39,11 +38,8 @@ green_3_fo=(-fn '-Bitstream-Terminal-normal-normal-normal-*-18-*-*-*-c-110-iso10
 green_4_fo=(-fn '-B&H-LucidaTypewriter-normal-normal-normal-Sans-19-*-*-*-m-110-iso10646-1')
 green_5_fo=(-fn '-B&H-LucidaTypewriter-normal-normal-normal-Sans-25-*-*-*-m-180-iso10646-1')
 green_6_fo=(-fn '-B&H-LucidaTypewriter-normal-normal-normal-Sans-34-*-*-*-m-200-iso10646-1')
-selected_font="$green_3_fo"

-# '-*-luxi mono-medium-r-normal-*-*-*-*-*-*-*-*-*'
-# '-*-nimbus\ mono-regular-r-*-*-*-*-*-*-*-*-*-*'
-# '-*-courier-regular-r-*-*-*-*-100-100-p-*-*-*'
+selected_font='-bitstream-menlo-medium-r-normal--0-0-0-0-m-0-iso10646-1'


 # # coding=UTF-8
diff --git a/sanitize b/sanitize
index 68e7c31..285e9f0 100755
--- a/sanitize
+++ b/sanitize
@@ -1,6 +1,5 @@
 #!/bin/bash

-# https://termbin.com/683a

 sanitize_ld=(
     -fsanitize=leak
@@ -56,6 +55,5 @@ export CFLAGS=$(trim_spaces "${CFLAGS:-} ${sanitize_cc[*]} -g -g3 -ggdb -O0")
 export LDFLAGS=$(trim_spaces "${LDFLAGS:-} ${sanitize_ld[*]}")


-gcc ${CFLAGS} ${LDFLAGS} $@
-
+echo gcc ${CFLAGS} ${LDFLAGS} $@
ViewGit