rpm/livecd-openSUSE
SHA256
1
0
Fork 0
forked from pool/livecd-openSUSE
Code Pull Requests Activity

Fix pre-checkin.sh format and add missing function

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=20
This commit is contained in:
Fabian Vogt 2019-03-06 14:34:15 +00:00 committed by Git OBS Bridge
parent 4ed24fa169
commit 6af7720167
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
livecd-tumbleweed-xfce.kiwi
View File

@ -51,7 +51,6 @@
<package name="live-langset-data"/> <package name="live-langset-data"/>
<package name="live-add-yast-repos"/> <package name="live-add-yast-repos"/>
<archive name="livecd-udev.tar.xz"/> <archive name="livecd-udev.tar.xz"/>
<archive name="xfce-changecontrolxml.tar.xz"/>
<!-- list-common.sh --> <!-- list-common.sh -->
<package name="aaa_base" replaces="gutenprint"/> <package name="aaa_base" replaces="gutenprint"/>
@ -359,6 +358,7 @@
<package name="aaa_base" replaces="fprintd"/> <package name="aaa_base" replaces="fprintd"/>
<ignore name="fprintd"/> <ignore name="fprintd"/>
<package name="libxslt-tools"/> <package name="libxslt-tools"/>
<archive name="xfce-changecontrolxml.tar.xz"/>
<package name="aaa_base" replaces="sound-juicer"/> <package name="aaa_base" replaces="sound-juicer"/>
<ignore name="sound-juicer"/> <ignore name="sound-juicer"/>
<package name="aaa_base" replaces="remmina"/> <package name="aaa_base" replaces="remmina"/>

32
pre-checkin.sh
View File

@ -26,6 +26,10 @@ installPattern() {
PACKAGES="$PACKAGES\n <namedCollection name=\"$1\"/>" PACKAGES="$PACKAGES\n <namedCollection name=\"$1\"/>"
} }
archive() {
PACKAGES="$PACKAGES\n <archive name=\"$1\"/>"
}
for distro in leap tumbleweed; do for distro in leap tumbleweed; do
distroname="openSUSE Tumbleweed" distroname="openSUSE Tumbleweed"
if [ "${distro}" = "leap" ]; then if [ "${distro}" = "leap" ]; then
@ -35,22 +39,22 @@ for distro in leap tumbleweed; do
for flavor in gnome kde xfce x11; do for flavor in gnome kde xfce x11; do
uppercaseflavor="$(echo "${flavor}" | tr a-z A-Z)" uppercaseflavor="$(echo "${flavor}" | tr a-z A-Z)"
if [ "${flavor}" = "x11" ]; then if [ "${flavor}" = "x11" ]; then
name="${distroname} Rescue CD" name="${distroname} Rescue CD"
else else
name="${distroname} ${uppercaseflavor} Live" name="${distroname} ${uppercaseflavor} Live"
fi fi
PACKAGES="\n <!-- list-common.sh -->" PACKAGES="\n <!-- list-common.sh -->"
. "$PWD/list-common.sh" . "$PWD/list-common.sh"
PACKAGES="$PACKAGES\n\n <!-- list-${flavor}.sh -->" PACKAGES="$PACKAGES\n\n <!-- list-${flavor}.sh -->"
. "$PWD/list-${flavor}.sh" . "$PWD/list-${flavor}.sh"
[ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi [ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi
sed "s#@FLAVOR@#${flavor}#g;\ sed "s#@FLAVOR@#${flavor}#g;\
s#@NAME@#${name// /-}#g;\ s#@NAME@#${name// /-}#g;\
s#@DISPLAYNAME@#${name}#g;\ s#@DISPLAYNAME@#${name}#g;\
s#@VOLID@#${name// /_}#g;\ s#@VOLID@#${name// /_}#g;\
s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > livecd-${distro}-${flavor}.kiwi s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > livecd-${distro}-${flavor}.kiwi
done done
done done