projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zshrc: rely only on `uname -n` for $HOSTNAME handling
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
2875222
..
231de8e
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-843,6
+843,8
@@
function grmlcomp () {
localname=$(hostname)
elif check_com hostnamectl ; then
localname=$(hostnamectl --static)
localname=$(hostname)
elif check_com hostnamectl ; then
localname=$(hostnamectl --static)
+ else
+ localname="$(uname -n)"
fi
hosts=(
fi
hosts=(
@@
-1864,7
+1866,7
@@
done
function batterydarwin () {
GRML_BATTERY_LEVEL=''
local -a table
function batterydarwin () {
GRML_BATTERY_LEVEL=''
local -a table
-table=( ${$(pmset -g ps)[(w)
7,8
]%%(\%|);} )
+table=( ${$(pmset -g ps)[(w)
8,9
]%%(\%|);} )
if [[ -n $table[2] ]] ; then
case $table[2] in
charging)
if [[ -n $table[2] ]] ; then
case $table[2] in
charging)
@@
-2518,11
+2520,7
@@
function grml_vcs_to_screen_title () {
function grml_maintain_name () {
local localname
function grml_maintain_name () {
local localname
- if check_com hostname ; then
- localname=$(hostname)
- elif check_com hostnamectl ; then
- localname=$(hostnamectl --static)
- fi
+ localname="$(uname -n)"
# set hostname if not running on local machine
if [[ -n "$HOSTNAME" ]] && [[ "$HOSTNAME" != "${localname}" ]] ; then
# set hostname if not running on local machine
if [[ -n "$HOSTNAME" ]] && [[ "$HOSTNAME" != "${localname}" ]] ; then
@@
-3490,6
+3488,11
@@
function simple-extract () {
USES_STDIN=true
USES_STDOUT=false
;;
USES_STDIN=true
USES_STDOUT=false
;;
+ *tar.zst)
+ DECOMP_CMD="tar --zstd -xvf -"
+ USES_STDIN=true
+ USES_STDOUT=false
+ ;;
*tar)
DECOMP_CMD="tar -xvf -"
USES_STDIN=true
*tar)
DECOMP_CMD="tar -xvf -"
USES_STDIN=true
@@
-3535,6
+3538,11
@@
function simple-extract () {
USES_STDIN=true
USES_STDOUT=true
;;
USES_STDIN=true
USES_STDOUT=true
;;
+ *zst)
+ DECOMP_CMD="zstd -d -c -"
+ USES_STDIN=true
+ USES_STDOUT=true
+ ;;
*)
print "ERROR: '$ARCHIVE' has unrecognized archive type." >&2
RC=$((RC+1))
*)
print "ERROR: '$ARCHIVE' has unrecognized archive type." >&2
RC=$((RC+1))