mirror of
https://github.com/Ximi1970/systray-x.git
synced 2025-11-02 11:25:49 +01:00
Update creators for Leap 15.5
This commit is contained in:
@@ -40,9 +40,9 @@ OBS_RPM_GNOME_EXT+="master "
|
|||||||
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
||||||
OBS_RPM_PKS+="fed38 "
|
OBS_RPM_PKS+="fed38 "
|
||||||
OBS_RPM_GNOME_EXT+="master "
|
OBS_RPM_GNOME_EXT+="master "
|
||||||
OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
||||||
OBS_RPM_PKS+="fedraw "
|
#OBS_RPM_PKS+="fedraw "
|
||||||
OBS_RPM_GNOME_EXT+="master "
|
#OBS_RPM_GNOME_EXT+="master "
|
||||||
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
||||||
OBS_RPM_PKS+="el7 "
|
OBS_RPM_PKS+="el7 "
|
||||||
OBS_RPM_GNOME_EXT+="v26 "
|
OBS_RPM_GNOME_EXT+="v26 "
|
||||||
@@ -171,7 +171,7 @@ create_rpm_tar() {
|
|||||||
#
|
#
|
||||||
# Find rpm
|
# Find rpm
|
||||||
#
|
#
|
||||||
local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/")
|
local RPM_FILE=$(grep ">${OBS_PACKAGE}-${VERSION}.*rpm<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*rpm\)<.*/\1/")
|
||||||
rm -f index.html
|
rm -f index.html
|
||||||
|
|
||||||
echo "Found: "${RPM_FILE}
|
echo "Found: "${RPM_FILE}
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ OBS_RPM_ARCHS+="Fedora_37/x86_64 "
|
|||||||
OBS_RPM_PKS+="fed37 "
|
OBS_RPM_PKS+="fed37 "
|
||||||
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
||||||
OBS_RPM_PKS+="fed38 "
|
OBS_RPM_PKS+="fed38 "
|
||||||
OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
||||||
OBS_RPM_PKS+="fedraw "
|
#OBS_RPM_PKS+="fedraw "
|
||||||
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
||||||
OBS_RPM_PKS+="el7 "
|
OBS_RPM_PKS+="el7 "
|
||||||
OBS_RPM_ARCHS+="CentOS_8/x86_64 "
|
OBS_RPM_ARCHS+="CentOS_8/x86_64 "
|
||||||
@@ -99,7 +99,7 @@ create_rpm_tar() {
|
|||||||
#
|
#
|
||||||
# Find rpm
|
# Find rpm
|
||||||
#
|
#
|
||||||
local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/")
|
local RPM_FILE=$(grep ">${OBS_PACKAGE}-${VERSION}.*rpm<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*rpm\)<.*/\1/")
|
||||||
rm -f index.html
|
rm -f index.html
|
||||||
|
|
||||||
echo "Found: "${RPM_FILE}
|
echo "Found: "${RPM_FILE}
|
||||||
@@ -513,6 +513,63 @@ if [ "$ENABLE_DEB" = true ] ; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$ENABLE_PAC" = true ] ; then
|
||||||
|
#
|
||||||
|
# Create bash installers for PAC based distributions
|
||||||
|
#
|
||||||
|
INDEX=1
|
||||||
|
for pacdir in $OBS_PAC_ARCHS ; do
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo
|
||||||
|
echo "Generating installer: "${pacdir}
|
||||||
|
echo
|
||||||
|
|
||||||
|
#
|
||||||
|
# Get base of the repo
|
||||||
|
#
|
||||||
|
REPO_DISTR=$(echo ${pacdir} | cut -d'/' -f1)
|
||||||
|
REPO_ARCH=$(echo ${pacdir} | cut -d'/' -f2)
|
||||||
|
|
||||||
|
PAC_NAME_EXT=$(echo ${OBS_PAC_PKS} | cut -d' ' -f${INDEX})
|
||||||
|
|
||||||
|
#
|
||||||
|
# Generate the SysTray-X tar file
|
||||||
|
#
|
||||||
|
create_pac_tar ${OBS_REPO_BASE} ${REPO_DISTR} ${REPO_ARCH} ${PAC_NAME_EXT}
|
||||||
|
|
||||||
|
#
|
||||||
|
# Create installer
|
||||||
|
#
|
||||||
|
INSTALLER=SysTray-X-${FOUND_VERSION}-${REPO_DISTR}-${REPO_ARCH}-KDE-install.sh
|
||||||
|
cp -f ../dist/install.sh ${INSTALLER}
|
||||||
|
|
||||||
|
#
|
||||||
|
# Insert Kde setup
|
||||||
|
#
|
||||||
|
sed -i -e "/__XXXX_SETUP__/r../dist/install.${REPO_DISTR}-Kde.sh" ${INSTALLER}
|
||||||
|
sed -i -e "s/__GNOME_INSTALLER__/SysTray-X-${FOUND_VERSION}-${REPO_DISTR}-${REPO_ARCH}-GNOME-install.sh/" ${INSTALLER}
|
||||||
|
sed -i -e "s/__MINIMAL_INSTALLER__/SysTray-X-${FOUND_VERSION}-${REPO_DISTR}-${REPO_ARCH}-Minimal-install.sh/" ${INSTALLER}
|
||||||
|
sed -i -e "s/__XXXX_SETUP__//" ${INSTALLER}
|
||||||
|
|
||||||
|
#
|
||||||
|
# Insert install tar
|
||||||
|
#
|
||||||
|
cat SysTray-X-${FOUND_VERSION}-${REPO_DISTR}.tar.xz >> ${INSTALLER}
|
||||||
|
chmod 755 ${INSTALLER}
|
||||||
|
|
||||||
|
#
|
||||||
|
# Cleanup
|
||||||
|
#
|
||||||
|
rm -f SysTray-X-${FOUND_VERSION}-${REPO_DISTR}.tar.xz
|
||||||
|
|
||||||
|
#
|
||||||
|
# Update index
|
||||||
|
#
|
||||||
|
INDEX=$((INDEX+1))
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
# Cleanup
|
# Cleanup
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ OBS_RPM_ARCHS+="Fedora_37/x86_64 "
|
|||||||
OBS_RPM_PKS+="fed37 "
|
OBS_RPM_PKS+="fed37 "
|
||||||
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
||||||
OBS_RPM_PKS+="fed38 "
|
OBS_RPM_PKS+="fed38 "
|
||||||
OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
||||||
OBS_RPM_PKS+="fedraw "
|
#OBS_RPM_PKS+="fedraw "
|
||||||
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
||||||
OBS_RPM_PKS+="el7 "
|
OBS_RPM_PKS+="el7 "
|
||||||
OBS_RPM_ARCHS+="CentOS_8/x86_64 "
|
OBS_RPM_ARCHS+="CentOS_8/x86_64 "
|
||||||
@@ -99,7 +99,8 @@ create_rpm_tar() {
|
|||||||
#
|
#
|
||||||
# Find rpm
|
# Find rpm
|
||||||
#
|
#
|
||||||
local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/")
|
local RPM_FILE=$(grep ">${OBS_PACKAGE}-.*${VERSION}.*rpm<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-.*rpm\)<.*/\1/")
|
||||||
|
|
||||||
rm -f index.html
|
rm -f index.html
|
||||||
|
|
||||||
echo "Found: "${RPM_FILE}
|
echo "Found: "${RPM_FILE}
|
||||||
|
|||||||
@@ -40,9 +40,9 @@ OBS_RPM_GNOME_EXT+="master "
|
|||||||
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
||||||
OBS_RPM_PKS+="fed38 "
|
OBS_RPM_PKS+="fed38 "
|
||||||
OBS_RPM_GNOME_EXT+="master "
|
OBS_RPM_GNOME_EXT+="master "
|
||||||
OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
||||||
OBS_RPM_PKS+="fedraw "
|
#OBS_RPM_PKS+="fedraw "
|
||||||
OBS_RPM_GNOME_EXT+="master "
|
#OBS_RPM_GNOME_EXT+="master "
|
||||||
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
||||||
OBS_RPM_PKS+="el7 "
|
OBS_RPM_PKS+="el7 "
|
||||||
OBS_RPM_GNOME_EXT+="v26 "
|
OBS_RPM_GNOME_EXT+="v26 "
|
||||||
@@ -167,11 +167,11 @@ create_rpm_tar() {
|
|||||||
#
|
#
|
||||||
rm -f index.html
|
rm -f index.html
|
||||||
wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/"
|
wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/"
|
||||||
|
|
||||||
#
|
#
|
||||||
# Find rpm
|
# Find rpm
|
||||||
#
|
#
|
||||||
local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/")
|
local RPM_FILE=$(grep ">${OBS_PACKAGE}-${VERSION}.*rpm<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*rpm\)<.*/\1/")
|
||||||
rm -f index.html
|
rm -f index.html
|
||||||
|
|
||||||
echo "Found: "${RPM_FILE}
|
echo "Found: "${RPM_FILE}
|
||||||
@@ -537,7 +537,7 @@ if [ "$ENABLE_RPM" = true ] ; then
|
|||||||
# Generate the SysTray-X tar file
|
# Generate the SysTray-X tar file
|
||||||
#
|
#
|
||||||
create_rpm_tar ${OBS_REPO_BASE} ${REPO_DISTR} ${REPO_ARCH} ${RPM_NAME_EXT} ${GNOME_EXT}
|
create_rpm_tar ${OBS_REPO_BASE} ${REPO_DISTR} ${REPO_ARCH} ${RPM_NAME_EXT} ${GNOME_EXT}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Create installer
|
# Create installer
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ OBS_RPM_ARCHS+="Fedora_37/x86_64 "
|
|||||||
OBS_RPM_PKS+="fed37 "
|
OBS_RPM_PKS+="fed37 "
|
||||||
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
||||||
OBS_RPM_PKS+="fed38 "
|
OBS_RPM_PKS+="fed38 "
|
||||||
OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
||||||
OBS_RPM_PKS+="fedraw "
|
#OBS_RPM_PKS+="fedraw "
|
||||||
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
||||||
OBS_RPM_PKS+="el7 "
|
OBS_RPM_PKS+="el7 "
|
||||||
OBS_RPM_ARCHS+="CentOS_8/x86_64 "
|
OBS_RPM_ARCHS+="CentOS_8/x86_64 "
|
||||||
@@ -99,7 +99,7 @@ create_rpm_tar() {
|
|||||||
#
|
#
|
||||||
# Find rpm
|
# Find rpm
|
||||||
#
|
#
|
||||||
local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^dgm].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/")
|
local RPM_FILE=$(grep ">${OBS_PACKAGE}-${VERSION}.*rpm<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}.*rpm\)<.*/\1/")
|
||||||
rm -f index.html
|
rm -f index.html
|
||||||
|
|
||||||
echo "Found: "${RPM_FILE}
|
echo "Found: "${RPM_FILE}
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ OBS_RPM_ARCHS+="Fedora_37/x86_64 "
|
|||||||
OBS_RPM_PKS+="fed37 "
|
OBS_RPM_PKS+="fed37 "
|
||||||
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
OBS_RPM_ARCHS+="Fedora_38/x86_64 "
|
||||||
OBS_RPM_PKS+="fed38 "
|
OBS_RPM_PKS+="fed38 "
|
||||||
OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
#OBS_RPM_ARCHS+="Fedora_Rawhide/x86_64 "
|
||||||
OBS_RPM_PKS+="fedraw "
|
#OBS_RPM_PKS+="fedraw "
|
||||||
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
OBS_RPM_ARCHS+="CentOS_7/x86_64 "
|
||||||
OBS_RPM_PKS+="el7 "
|
OBS_RPM_PKS+="el7 "
|
||||||
OBS_RPM_ARCHS+="CentOS_8/x86_64 "
|
OBS_RPM_ARCHS+="CentOS_8/x86_64 "
|
||||||
@@ -95,11 +95,12 @@ create_rpm_tar() {
|
|||||||
#
|
#
|
||||||
rm -f index.html
|
rm -f index.html
|
||||||
wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/"
|
wget -q "${REPO_BASE}/${REPO_DISTR}/${REPO_ARCH}/"
|
||||||
|
|
||||||
#
|
#
|
||||||
# Find rpm
|
# Find rpm
|
||||||
#
|
#
|
||||||
local RPM_FILE=$(grep ">${OBS_PACKAGE}-[^d].*${VERSION}.*<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-[^d].*rpm\)<.*/\1/")
|
local RPM_FILE=$(grep ">${OBS_PACKAGE}-.*${VERSION}.*rpm<" index.html | sed -e "s/.*>\(${OBS_PACKAGE}-.*rpm\)<.*/\1/")
|
||||||
|
|
||||||
rm -f index.html
|
rm -f index.html
|
||||||
|
|
||||||
echo "Found: "${RPM_FILE}
|
echo "Found: "${RPM_FILE}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Token set in .gitconfig
|
||||||
|
|
||||||
VERSION=`git describe --long | sed "s/-.*//"`
|
VERSION=`git describe --long | sed "s/-.*//"`
|
||||||
|
|
||||||
./ghr ${VERSION} bin/
|
./ghr ${VERSION} bin/
|
||||||
|
|||||||
Reference in New Issue
Block a user