Skip to content

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

commit packed 3.60.10

parent 5bbc2139
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 7 deletions
packed/epm.sh
View file @ cdcbf31d
...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR ...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.60.9" EPMVERSION="3.60.10"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -1147,7 +1147,7 @@ __epm_addrepo_altlinux_url() ...@@ -1147,7 +1147,7 @@ __epm_addrepo_altlinux_url()
if echo "$base" | grep -q "^RPMS\." ; then if echo "$base" | grep -q "^RPMS\." ; then
REPO_NAME="$(echo $base | sed -e 's|.*\.||')" REPO_NAME="$(echo $base | sed -e 's|.*\.||')"
url="$(dirname $url)" url="$(dirname $url)"
docmd epm repo add "rpm $url $REPO_NAME" __epm_addrepo_altlinux_short rpm "$url" "$REPO_NAME"
return return
fi fi
...@@ -1156,8 +1156,8 @@ __epm_addrepo_altlinux_url() ...@@ -1156,8 +1156,8 @@ __epm_addrepo_altlinux_url()
local baseurl="$(eget --list "$url/RPMS.*")" local baseurl="$(eget --list "$url/RPMS.*")"
base="$(basename "$baseurl")" base="$(basename "$baseurl")"
if echo "$base" | grep -q "^RPMS\." ; then if echo "$base" | grep -q "^RPMS\." ; then
REPO_NAME="$(echo $base | sed -e 's|.*\.||')" REPO_NAME="$(echo "$base" | sed -e 's|.*\.||')"
docmd epm repo add "rpm $url $REPO_NAME" __epm_addrepo_altlinux_short rpm "$url" "$REPO_NAME"
return return
fi fi
...@@ -1165,8 +1165,9 @@ __epm_addrepo_altlinux_url() ...@@ -1165,8 +1165,9 @@ __epm_addrepo_altlinux_url()
local res='' local res=''
for arch in $(get_archlist) ; do for arch in $(get_archlist) ; do
local rd="$(eget --list $url/$arch/RPMS.*)" local rd="$(eget --list $url/$arch/RPMS.*)"
[ -d "$rd" ] || continue [ -n "$rd" ] || continue
local REPO_NAME="$(echo "$rd" | sed -e 's|.*\.||')" local REPO_NAME="$(echo "$rd" | sed -e 's|/*$||' -e 's|.*\.||')"
[ "$REPO_NAME" = "*" ] && continue
docmd epm repo add "rpm $url $arch $REPO_NAME" docmd epm repo add "rpm $url $arch $REPO_NAME"
res='1' res='1'
done done
...@@ -13739,6 +13740,9 @@ case "$VENDOR_ID" in ...@@ -13739,6 +13740,9 @@ case "$VENDOR_ID" in
[ -n "$fr" ] && echo "$fr" | grep -q "$DISTRIB_RELEASE" && DISTRIB_FULL_RELEASE="$fr" [ -n "$fr" ] && echo "$fr" | grep -q "$DISTRIB_RELEASE" && DISTRIB_FULL_RELEASE="$fr"
fi fi
;; ;;
"fedora")
DISTRIB_ID="Fedora"
;;
esac esac
case "$DISTRIB_ID" in case "$DISTRIB_ID" in
......
packed/serv.sh
View file @ cdcbf31d
...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR ...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.60.9" EPMVERSION="3.60.10"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -2149,6 +2149,9 @@ case "$VENDOR_ID" in ...@@ -2149,6 +2149,9 @@ case "$VENDOR_ID" in
[ -n "$fr" ] && echo "$fr" | grep -q "$DISTRIB_RELEASE" && DISTRIB_FULL_RELEASE="$fr" [ -n "$fr" ] && echo "$fr" | grep -q "$DISTRIB_RELEASE" && DISTRIB_FULL_RELEASE="$fr"
fi fi
;; ;;
"fedora")
DISTRIB_ID="Fedora"
;;
esac esac
case "$DISTRIB_ID" in case "$DISTRIB_ID" in
......
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