sync over some fixes

Giles Westwood · Giles Westwood · commit 6228bf691825 · 2025-07-23T17:12:37.000+01:00
diff --git a/lib/github.sh b/lib/github.sh
@@ -428,6 +428,15 @@ sk-github(){
   _sk-github_curl https://api.github.com
 }
 
+sk-github-release-list-latest(){
+  local owner_repo="${1:-sigoden/upt}"
+  local output=''
+  sk-git-creds
+  echo "https://api.github.com/repos/$owner_repo/releases/latest"
+  output=`_sk-github_curl  https://api.github.com/repos/$owner_repo/releases/latest`
+  echo $output | jq -r '.'
+}
+
 sk-github-org-list-watchers(){
   local reponame=$1
   local output=''
diff --git a/lib/logger.sh b/lib/logger.sh
@@ -8,7 +8,7 @@ _sk_logger_common(){
   log_name="${LOG_NAME:-"${NAME}.log"}"
 
   if [[ $EUID -ne 0 ]];then
-    log_dir_default=~/log
+    log_dir_default="${HOME}/log"
   else
     log_dir_default=/var/log/shellkit
   fi
@@ -18,7 +18,10 @@ _sk_logger_common(){
   export LOG_DIR=$log_dir
 
   if [[ ! -d "$log_dir" ]];then
-    sk-dir-make $log_dir
+    if ! sk-dir-make $log_dir;then
+      log_dir=/tmp
+      export LOG_DIR=$log_dir
+    fi
     # dont use logrotate if we have a date based log_dir
     year=$(date +"%Y")
     if ! grep -q $year <<< $(echo $log_dir);then
diff --git a/lib/logrotate.sh b/lib/logrotate.sh
@@ -26,10 +26,18 @@ sk-logrotate(){
 
   sk-pack-install -b logrotate --post_install 'brew services start logrotate'
 
-  if [[ -d /usr/local/etc/logrotate.d ]];then
-    logrotate_config_file=/usr/local/etc/logrotate.d/${config_name}
-    export LOGROTATE_CONFIG_FILE=$logrotate_config_file
-    logrotate_sudo=0
+  if [[ "$PLATFORM" = 'Darwin' ]];then
+
+    if [[ -d /opt/homebrew/etc/logrotate.d ]];then
+      logrotate_config_file=/opt/homebrew/etc/logrotate.d/${config_name}
+      export LOGROTATE_CONFIG_FILE=$logrotate_config_file
+      logrotate_sudo=0
+    elif [[ -d /usr/local/etc/logrotate.d ]];then
+      logrotate_config_file=/usr/local/etc/logrotate.d/${config_name}
+      export LOGROTATE_CONFIG_FILE=$logrotate_config_file
+      logrotate_sudo=0
+    fi
+
   else
     logrotate_config_file=/etc/logrotate.d/${config_name}
     export LOGROTATE_CONFIG_FILE=$logrotate_config_file
diff --git a/lib/sys.sh b/lib/sys.sh
@@ -7,6 +7,11 @@ alias pc="pre-commit"
 alias pci="pre-commit install"
 alias pca="sk-pre-commit-all"
 
+sk-host-to-fqdn(){
+  local host="${1:-localhost}"
+  host "$host" | awk '/has address/ {print $1}'
+}
+
 sk-group-user-uid-highest(){
   group_name="${1:-wibble}"
 
diff --git a/lib/xml.sh b/lib/xml.sh
@@ -32,7 +32,7 @@ END {
 }
 
 sk-xml-pretty(){
-  sk-pack-install -b xmllint -p libxml2-utils
+  sk-pack-install -b xmllint --keg_force -p libxml2-utils --mac_package libxml2
   xmllint --format "$@"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ END {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`sk-xml-pretty(){`
`35`		`- sk-pack-install -b xmllint -p libxml2-utils`
	`35`	`+ sk-pack-install -b xmllint --keg_force -p libxml2-utils --mac_package libxml2`
`36`	`36`	`xmllint --format "$@"`
`37`	`37`	`}`
`38`	`38`