Commit 4d669789 authored by Vitaly Lipatov's avatar Vitaly Lipatov

update packed

parent 48575c91
...@@ -1624,6 +1624,7 @@ __epm_get_altpkg_url() ...@@ -1624,6 +1624,7 @@ __epm_get_altpkg_url()
[ "$arch" = "noarch" ] || arch=$(arch) [ "$arch" = "noarch" ] || arch=$(arch)
# HACK: filename can be list # HACK: filename can be list
local filename=$(paoapi packages/$1 | get_pao_var filename | grep $arch) local filename=$(paoapi packages/$1 | get_pao_var filename | grep $arch)
[ -n "$filename" ] || fatal "Can't get filename"
# fixme: get from /branches # fixme: get from /branches
local dv=$DISTRNAME/$DISTRVERSION/branch local dv=$DISTRNAME/$DISTRVERSION/branch
[ "$DISTRVERSION" = "Sisyphus" ] && dv=$DISTRNAME/$DISTRVERSION [ "$DISTRVERSION" = "Sisyphus" ] && dv=$DISTRNAME/$DISTRVERSION
...@@ -5297,8 +5298,8 @@ pkgtype() ...@@ -5297,8 +5298,8 @@ pkgtype()
get_var() get_var()
{ {
grep -i "^$1 *=" | head -n 1 | sed -e "s/^[^=]*[ \t]*=[ \t]*//" # get first variable and print it out, drop quotes if exists
grep -i "^$1 *=" | head -n 1 | sed -e "s/^[^=]*[ \t]*=[ \t]*//" | sed -e "s/^[\'\"]\(.*\)[\'\"]/\1/"
} }
# 2010.1 -> 2010 # 2010.1 -> 2010
...@@ -5526,6 +5527,8 @@ elif [ `uname -o 2>/dev/null` = "Cygwin" ] ; then ...@@ -5526,6 +5527,8 @@ elif [ `uname -o 2>/dev/null` = "Cygwin" ] ; then
# try use standart LSB info by default # try use standart LSB info by default
elif distro lsb-release && [ -n "$DISTRIB_RELEASE" ]; then elif distro lsb-release && [ -n "$DISTRIB_RELEASE" ]; then
# use LSB # use LSB
# fix distro name
case "$DISTRIB_ID" in case "$DISTRIB_ID" in
"openSUSE Tumbleweed") "openSUSE Tumbleweed")
DISTRIB_ID="Tumbleweed" DISTRIB_ID="Tumbleweed"
......
...@@ -1071,8 +1071,8 @@ pkgtype() ...@@ -1071,8 +1071,8 @@ pkgtype()
get_var() get_var()
{ {
grep -i "^$1 *=" | head -n 1 | sed -e "s/^[^=]*[ \t]*=[ \t]*//" # get first variable and print it out, drop quotes if exists
grep -i "^$1 *=" | head -n 1 | sed -e "s/^[^=]*[ \t]*=[ \t]*//" | sed -e "s/^[\'\"]\(.*\)[\'\"]/\1/"
} }
# 2010.1 -> 2010 # 2010.1 -> 2010
...@@ -1300,6 +1300,8 @@ elif [ `uname -o 2>/dev/null` = "Cygwin" ] ; then ...@@ -1300,6 +1300,8 @@ elif [ `uname -o 2>/dev/null` = "Cygwin" ] ; then
# try use standart LSB info by default # try use standart LSB info by default
elif distro lsb-release && [ -n "$DISTRIB_RELEASE" ]; then elif distro lsb-release && [ -n "$DISTRIB_RELEASE" ]; then
# use LSB # use LSB
# fix distro name
case "$DISTRIB_ID" in case "$DISTRIB_ID" in
"openSUSE Tumbleweed") "openSUSE Tumbleweed")
DISTRIB_ID="Tumbleweed" DISTRIB_ID="Tumbleweed"
......
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