Skip to content

E
eepm
Commit 34e99ce3 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

commit packed 3.32.0

parent 376a6b52
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
packed/serv.sh
View file @ 34e99ce3
...@@ -592,6 +592,7 @@ set_distro_info() ...@@ -592,6 +592,7 @@ set_distro_info()
DISTRARCH=$($DISTRVENDOR --distro-arch) DISTRARCH=$($DISTRVENDOR --distro-arch)
fi fi
DISTRCONTROL="$($DISTRVENDOR -y)" DISTRCONTROL="$($DISTRVENDOR -y)"
[ -n "$BASEDISTRNAME" ] || BASEDISTRNAME=$($DISTRVENDOR -s)
# TODO: improve BIGTMPDIR conception # TODO: improve BIGTMPDIR conception
# https://bugzilla.mozilla.org/show_bug.cgi?id=69938 # https://bugzilla.mozilla.org/show_bug.cgi?id=69938
...@@ -667,8 +668,8 @@ serv_cat() ...@@ -667,8 +668,8 @@ serv_cat()
docmd systemctl cat "$SERVICE" "$@" docmd systemctl cat "$SERVICE" "$@"
;; ;;
*) *)
case $DISTRNAME in case $BASEDISTRNAME in
ALTLinux|ALTServer) "alt")
local INITFILE=/etc/init.d/$SERVICE local INITFILE=/etc/init.d/$SERVICE
[ -r "$INITFILE" ] || fatal "Can't find init file $INITFILE" [ -r "$INITFILE" ] || fatal "Can't find init file $INITFILE"
docmd cat $INITFILE docmd cat $INITFILE
...@@ -820,8 +821,8 @@ serv_exists() ...@@ -820,8 +821,8 @@ serv_exists()
docmd systemctl cat "$SERVICE" "$@" >/dev/null 2>/dev/null docmd systemctl cat "$SERVICE" "$@" >/dev/null 2>/dev/null
;; ;;
*) *)
case $DISTRNAME in case $BASEDISTRNAME in
ALTLinux|ALTServer) "alt")
local INITFILE=/etc/init.d/$SERVICE local INITFILE=/etc/init.d/$SERVICE
[ -r "$INITFILE" ] || return [ -r "$INITFILE" ] || return
return ;; return ;;
...@@ -988,8 +989,8 @@ serv_log() ...@@ -988,8 +989,8 @@ serv_log()
sudocmd journalctl -b -u "$SERVICE" "$@" sudocmd journalctl -b -u "$SERVICE" "$@"
;; ;;
*) *)
case $DISTRNAME in case $BASEDISTRNAME in
ALTLinux|ALTServer) "alt")
FF="" ; [ "$1" = "-f" ] && FF="-f" FF="" ; [ "$1" = "-f" ] && FF="-f"
__serv_log_altlinux "$SERVICE" $FF __serv_log_altlinux "$SERVICE" $FF
return ;; return ;;
...@@ -2375,7 +2376,7 @@ print_version() ...@@ -2375,7 +2376,7 @@ print_version()
local on_text="(host system)" local on_text="(host system)"
local virt="$($DISTRVENDOR -i)" local virt="$($DISTRVENDOR -i)"
[ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)" [ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)"
echo "Service manager version 3.31.1 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.32.0 https://wiki.etersoft.ru/Epm"
echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE" echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE"
echo "Copyright (c) Etersoft 2012-2021" echo "Copyright (c) Etersoft 2012-2021"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3." echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment