Skip to content

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

epm pack generic-appimage.sh: fix BASEDIR to use full unpacked directory name

parent 42c48023
Pipeline #16801 canceled with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 3 additions and 2 deletions
    pack.d/generic-appimage.sh
    View file @ 31c56444
    ...@@ -25,6 +25,9 @@ PRODUCT="$(basename $alpkg .AppImage)" ...@@ -25,6 +25,9 @@ PRODUCT="$(basename $alpkg .AppImage)"
    # unpack AppImage # unpack AppImage
    erc unpack $TAR || fatal erc unpack $TAR || fatal
    # BASEDIR is the unpacked directory (full name without extension)
    BASEDIR="$PRODUCT"
    # try separate VERSION from PRODUCT # try separate VERSION from PRODUCT
    if [ -z "$VERSION" ] ; then if [ -z "$VERSION" ] ; then
    PRODUCT="${PRODUCT/-x86_64/}" PRODUCT="${PRODUCT/-x86_64/}"
    ...@@ -32,8 +35,6 @@ if [ -z "$VERSION" ] ; then ...@@ -32,8 +35,6 @@ if [ -z "$VERSION" ] ; then
    [ -n "$VERSION" ] && PRODUCT="$(echo "$PRODUCT" | sed -e "s|[-_.]$VERSION.*||")" [ -n "$VERSION" ] && PRODUCT="$(echo "$PRODUCT" | sed -e "s|[-_.]$VERSION.*||")"
    [ -n "$VERSION" ] && VERSION="$(echo "$VERSION" | sed -e 's|^v||')" [ -n "$VERSION" ] && VERSION="$(echo "$VERSION" | sed -e 's|^v||')"
    fi fi
    BASEDIR="$PRODUCT"
    [ -L "$BASEDIR" ] && [ -d "AppDir" ] && BASEDIR="AppDir" [ -L "$BASEDIR" ] && [ -d "AppDir" ] && BASEDIR="AppDir"
    # try get version from X-AppImage-Version # try get version from X-AppImage-Version
    ......
    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