Merge pull request #851 from omacom/t3code/appimage-lib-names
T3 Code: accept the AppImage's compatibility libraries under their new names
This commit is contained in:
2 files changed
+8
-4
No files matched your search
@@ -85,10 +85,12 @@ package() {
|
|||||||
# The AppImage's usr/ tree is compatibility libraries for distributions that
|
# The AppImage's usr/ tree is compatibility libraries for distributions that
|
||||||
# lack them, and Arch is not one; its icons are the only part worth keeping.
|
# lack them, and Arch is not one; its icons are the only part worth keeping.
|
||||||
# A release that starts shipping something else there stops the build rather
|
# A release that starts shipping something else there stops the build rather
|
||||||
# than having it deleted quietly on the way past.
|
# than having it deleted quietly on the way past. The same six libraries
|
||||||
|
# under their full versioned names (libXss.so.1.0.0) or their GTK 3 names
|
||||||
|
# (libappindicator3, libindicator3) are not something else.
|
||||||
local unexpected
|
local unexpected
|
||||||
unexpected=$(find usr \( -type f -o -type l \) | grep -vE \
|
unexpected=$(find usr \( -type f -o -type l \) | grep -vE \
|
||||||
'^usr/share/icons/hicolor/[0-9]+x[0-9]+/apps/t3code\.png$|^usr/lib/lib(Xss\.so\.1|Xtst\.so\.6|appindicator\.so\.1|gconf-2\.so\.4|indicator\.so\.7|notify\.so\.4)$' || true)
|
'^usr/share/icons/hicolor/[0-9]+x[0-9]+/apps/t3code\.png$|^usr/lib/lib(Xss\.so\.1|Xtst\.so\.6|appindicator3?\.so\.1|gconf-2\.so\.4|indicator3?\.so\.7|notify\.so\.4)(\.[0-9]+)*$' || true)
|
||||||
if [[ -n "${unexpected}" ]]; then
|
if [[ -n "${unexpected}" ]]; then
|
||||||
echo "Unexpected files in the AppImage's usr/ tree:" >&2
|
echo "Unexpected files in the AppImage's usr/ tree:" >&2
|
||||||
echo "${unexpected}" >&2
|
echo "${unexpected}" >&2
|
||||||
|
|||||||
@@ -86,10 +86,12 @@ package() {
|
|||||||
# The AppImage's usr/ tree is compatibility libraries for distributions that
|
# The AppImage's usr/ tree is compatibility libraries for distributions that
|
||||||
# lack them, and Arch is not one; its icons are the only part worth keeping.
|
# lack them, and Arch is not one; its icons are the only part worth keeping.
|
||||||
# A release that starts shipping something else there stops the build rather
|
# A release that starts shipping something else there stops the build rather
|
||||||
# than having it deleted quietly on the way past.
|
# than having it deleted quietly on the way past. The same six libraries
|
||||||
|
# under their full versioned names (libXss.so.1.0.0) or their GTK 3 names
|
||||||
|
# (libappindicator3, libindicator3) are not something else.
|
||||||
local unexpected
|
local unexpected
|
||||||
unexpected=$(find usr \( -type f -o -type l \) | grep -vE \
|
unexpected=$(find usr \( -type f -o -type l \) | grep -vE \
|
||||||
'^usr/share/icons/hicolor/[0-9]+x[0-9]+/apps/t3code\.png$|^usr/lib/lib(Xss\.so\.1|Xtst\.so\.6|appindicator\.so\.1|gconf-2\.so\.4|indicator\.so\.7|notify\.so\.4)$' || true)
|
'^usr/share/icons/hicolor/[0-9]+x[0-9]+/apps/t3code\.png$|^usr/lib/lib(Xss\.so\.1|Xtst\.so\.6|appindicator3?\.so\.1|gconf-2\.so\.4|indicator3?\.so\.7|notify\.so\.4)(\.[0-9]+)*$' || true)
|
||||||
if [[ -n "${unexpected}" ]]; then
|
if [[ -n "${unexpected}" ]]; then
|
||||||
echo "Unexpected files in the AppImage's usr/ tree:" >&2
|
echo "Unexpected files in the AppImage's usr/ tree:" >&2
|
||||||
echo "${unexpected}" >&2
|
echo "${unexpected}" >&2
|
||||||
|
|||||||
Reference in new issue
Block a user