Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
ximper-builder
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
ximper-builder
Commits
d9364696
Verified
Commit
d9364696
authored
Feb 20, 2026
by
Kirill Unitsaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build-distro: move temp commit handling outside the build loop
parent
6ff079c7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
build-distro
bin/build-distro
+3
-6
No files found.
bin/build-distro
View file @
d9364696
...
@@ -101,9 +101,6 @@ makebuild() {
...
@@ -101,9 +101,6 @@ makebuild() {
print_blue
"Сборка по умолчанию с
$desktop_env
"
print_blue
"Сборка по умолчанию с
$desktop_env
"
fi
fi
# Обработка незакоммиченных изменений перед началом сборки
handle_uncommitted_changes
# Выполнение команды make в зависимости от рабочего окружения и типа сборки
# Выполнение команды make в зависимости от рабочего окружения и типа сборки
make
DEBUG
=
"
$DEBUG
"
SQUASHFS
=
"zstd"
DISTRO_VERSION
=
"
$VER
"
APTCONF
=
"
$APTCONF
"
"ximper-
${
desktop_env
}${
iso_suffix
}
.iso"
make
DEBUG
=
"
$DEBUG
"
SQUASHFS
=
"zstd"
DISTRO_VERSION
=
"
$VER
"
APTCONF
=
"
$APTCONF
"
"ximper-
${
desktop_env
}${
iso_suffix
}
.iso"
...
@@ -122,9 +119,6 @@ makebuild() {
...
@@ -122,9 +119,6 @@ makebuild() {
DFILENAME+
=
"-x86_64.iso"
DFILENAME+
=
"-x86_64.iso"
move_iso
move_iso
# Отмена временного коммита после завершения сборки
revert_temp_commit
}
}
move_iso
()
{
move_iso
()
{
...
@@ -257,12 +251,15 @@ done
...
@@ -257,12 +251,15 @@ done
pushd
"
$PROFILESDIR
"
>
/dev/null
||
exit
pushd
"
$PROFILESDIR
"
>
/dev/null
||
exit
handle_uncommitted_changes
# Выполнение сборки для каждого элемента в списке
# Выполнение сборки для каждого элемента в списке
for
build_item
in
"
${
build_list
[@]
}
"
;
do
for
build_item
in
"
${
build_list
[@]
}
"
;
do
IFS
=
':'
read
-r
desktop_env build_type
<<<
"
$build_item
"
IFS
=
':'
read
-r
desktop_env build_type
<<<
"
$build_item
"
makebuild
"
$build_type
"
"
$desktop_env
"
makebuild
"
$build_type
"
"
$desktop_env
"
done
done
revert_temp_commit
cleartmp
cleartmp
popd
>
/dev/null
||
exit
popd
>
/dev/null
||
exit
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment