From 1c09bacf245ddee5491ad454757fe41ede837eb4 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Mon, 20 Apr 2020 22:33:43 +0200 Subject: [PATCH] Fix installer for Fedora --- create_linux_installers.sh | 40 +++++++++++++++++++++++++++++---- create_linux_installers_test.sh | 40 +++++++++++++++++++++++++++++---- 2 files changed, 72 insertions(+), 8 deletions(-) diff --git a/create_linux_installers.sh b/create_linux_installers.sh index 652bb7d..4404492 100755 --- a/create_linux_installers.sh +++ b/create_linux_installers.sh @@ -211,12 +211,44 @@ create_rpm_tar() { wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/${RPM_FILE}" # - # Extract + # Get compression type # - rpm2cpio ${RPM_FILE} | cpio -i --to-stdout ./usr/bin/SysTray-X > ./${TAR_DIR}/SysTray-X 2>/dev/null - chmod 755 ./${TAR_DIR}/SysTray-X + COMPRESSION=$(rpm -qp --qf '%{PAYLOADCOMPRESSOR}\n' ${RPM_FILE}) +# echo ${COMPRESSION} + + case ${COMPRESSION} in + zstd) + # + # Extract + # + rpm2cpio ${RPM_FILE} | zstd -d | cpio --quiet -idm - rpm2cpio ${RPM_FILE} | cpio -i --to-stdout ./usr/share/doc/packages/systray-x/systray-x@Ximi1970.xpi > ./${TAR_DIR}/systray-x@Ximi1970.xpi 2>/dev/null + # + # Get files + # + cp -f ./usr/bin/SysTray-X ./${TAR_DIR}/SysTray-X + chmod 755 ./${TAR_DIR}/SysTray-X + cp -f ./usr/share/doc/systray-x/systray-x@Ximi1970.xpi ./${TAR_DIR}/systray-x@Ximi1970.xpi + ;; + *) + # + # Extract + # + rpm2cpio ${RPM_FILE} | cpio --quiet -idm + + # + # Get files + # + cp -f ./usr/bin/SysTray-X ./${TAR_DIR}/SysTray-X + chmod 755 ./${TAR_DIR}/SysTray-X + cp -f ./usr/share/doc/packages/systray-x/systray-x@Ximi1970.xpi ./${TAR_DIR}/systray-x@Ximi1970.xpi + ;; + esac + + # + # Cleanup + # + rm -rf ./usr if [ ! -f systray-x@Ximi1970.xpi ] ; then cp -f ./${TAR_DIR}/systray-x@Ximi1970.xpi . diff --git a/create_linux_installers_test.sh b/create_linux_installers_test.sh index 3fcdaa8..f78c4b3 100755 --- a/create_linux_installers_test.sh +++ b/create_linux_installers_test.sh @@ -211,13 +211,45 @@ create_rpm_tar() { wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/${RPM_FILE}" # - # Extract + # Get compression type # - rpm2cpio ${RPM_FILE} | cpio -i --to-stdout ./usr/bin/SysTray-X > ./${TAR_DIR}/SysTray-X 2>/dev/null - chmod 755 ./${TAR_DIR}/SysTray-X + COMPRESSION=$(rpm -qp --qf '%{PAYLOADCOMPRESSOR}\n' ${RPM_FILE}) +# echo ${COMPRESSION} + + case ${COMPRESSION} in + zstd) + # + # Extract + # + rpm2cpio ${RPM_FILE} | zstd -d | cpio --quiet -idm - rpm2cpio ${RPM_FILE} | cpio -i --to-stdout ./usr/share/doc/packages/systray-x/systray-x@Ximi1970.xpi > ./${TAR_DIR}/systray-x@Ximi1970.xpi 2>/dev/null + # + # Get files + # + cp -f ./usr/bin/SysTray-X ./${TAR_DIR}/SysTray-X + chmod 755 ./${TAR_DIR}/SysTray-X + cp -f ./usr/share/doc/systray-x/systray-x@Ximi1970.xpi ./${TAR_DIR}/systray-x@Ximi1970.xpi + ;; + *) + # + # Extract + # + rpm2cpio ${RPM_FILE} | cpio --quiet -idm + # + # Get files + # + cp -f ./usr/bin/SysTray-X ./${TAR_DIR}/SysTray-X + chmod 755 ./${TAR_DIR}/SysTray-X + cp -f ./usr/share/doc/packages/systray-x/systray-x@Ximi1970.xpi ./${TAR_DIR}/systray-x@Ximi1970.xpi + ;; + esac + + # + # Cleanup + # + rm -rf ./usr + if [ ! -f systray-x@Ximi1970.xpi ] ; then cp -f ./${TAR_DIR}/systray-x@Ximi1970.xpi . fi