Fix installer for Fedora

This commit is contained in:
Ximi1970
2020-04-20 22:33:43 +02:00
parent aff6c21bc9
commit 1c09bacf24
2 changed files with 72 additions and 8 deletions

View File

@@ -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 .

View File

@@ -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