mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 02:47:56 +01:00
cleanup
This commit is contained in:
parent
03fb874528
commit
697238fbdc
3 changed files with 15 additions and 11 deletions
20
.github/workflows/build_vars.yml
vendored
20
.github/workflows/build_vars.yml
vendored
|
|
@ -18,16 +18,16 @@ on:
|
|||
"flatpak_dir",
|
||||
"flatpak_refs"
|
||||
],
|
||||
"exclude": [
|
||||
{
|
||||
"version": "40",
|
||||
"flatpaks": "flatpak_dir"
|
||||
},
|
||||
{
|
||||
"version": "40",
|
||||
"flatpaks": "flatpak_refs"
|
||||
}
|
||||
],
|
||||
#"exclude": [
|
||||
# {
|
||||
# "version": "40",
|
||||
# "flatpaks": "flatpak_dir"
|
||||
# },
|
||||
# {
|
||||
# "version": "40",
|
||||
# "flatpaks": "flatpak_refs"
|
||||
# }
|
||||
#],
|
||||
"include": [
|
||||
{
|
||||
"version": "39",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
% if int(version) >= 41:
|
||||
append etc/anaconda/conf.d/anaconda.conf "[Payload]"
|
||||
append etc/anaconda/conf.d/anaconda.conf "flatpak_remote = ${flatpak_remote_name} ${_flatpak_repo_url}"
|
||||
#replace "fedora oci+https://registry.fedoraproject.org" "${flatpak_remote_name} ${_flatpak_repo_url}" etc/anaconda/anaconda.conf
|
||||
% else:
|
||||
replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
|
||||
replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [[ ${VERSION} >= 41 ]]
|
||||
then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
add_line=$(grep flatpak_manager.add_remote mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py)
|
||||
|
||||
add_line_repo=$(echo "${add_line}" | grep "${FLATPAK_REMOTE_NAME}")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue