Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
M
manjaro-tools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
29
Issues
29
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tools
development-tools
manjaro-tools
Commits
4134a2db
Commit
4134a2db
authored
Apr 19, 2018
by
Bernhard Landauer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
whitespaces
parent
fdf797e2
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
16 additions
and
16 deletions
+16
-16
initcpio/hooks/miso
initcpio/hooks/miso
+3
-3
initcpio/hooks/miso_pxe_http
initcpio/hooks/miso_pxe_http
+1
-1
lib/util-iso.sh
lib/util-iso.sh
+1
-1
lib/util-mount.sh
lib/util-mount.sh
+1
-1
lib/util-pkg-chroot.sh
lib/util-pkg-chroot.sh
+1
-1
lib/util-pkgtree.sh
lib/util-pkgtree.sh
+2
-2
lib/util-publish.sh
lib/util-publish.sh
+1
-1
lib/util-yaml.sh
lib/util-yaml.sh
+5
-5
lib/util.sh
lib/util.sh
+1
-1
No files found.
initcpio/hooks/miso
View file @
4134a2db
...
...
@@ -158,7 +158,7 @@ miso_mount_handler() {
fi
if
[[
"
${
checksum
}
"
==
"y"
]]
;
then
for
fs
in
rootfs desktopfs mhwdfs livefs
;
do
for
fs
in
rootfs desktopfs mhwdfs livefs
;
do
if
[[
-f
"/run/miso/bootmnt/
${
misobasedir
}
/
${
arch
}
/
${
fs
}
.sfs"
]]
;
then
if
[[
-f
"/run/miso/bootmnt/
${
misobasedir
}
/
${
arch
}
/
${
fs
}
.md5"
]]
;
then
msg
-n
":: Self-test requested, please wait..."
...
...
@@ -178,7 +178,7 @@ miso_mount_handler() {
fi
if
[[
"
${
verify
}
"
==
"y"
]]
;
then
for
fs
in
rootfs desktopfs mhwdfs livefs
;
do
for
fs
in
rootfs desktopfs mhwdfs livefs
;
do
if
[[
-f
"/run/miso/bootmnt/
${
misobasedir
}
/
${
arch
}
/
${
fs
}
.sfs"
]]
;
then
if
[[
-f
"/run/miso/bootmnt/
${
misobasedir
}
/
${
arch
}
/
${
fs
}
.sfs.sig"
]]
;
then
msg
-n
":: Signature verification requested, please wait..."
...
...
@@ -221,7 +221,7 @@ miso_mount_handler() {
local
dest_sfs
=
"/run/miso/sfs"
dest_img
=
"/run/miso/img"
local
lower_dir
for
sfs
in
livefs mhwdfs desktopfs rootfs
;
do
for
sfs
in
livefs mhwdfs desktopfs rootfs
;
do
if
[[
-f
"
${
src
}
/
${
sfs
}
.sfs"
]]
;
then
_mnt_sfs
"
${
src
}
/
${
sfs
}
.sfs"
"
${
dest_sfs
}
/
${
sfs
}
"
if
[[
-f
"
${
dest_sfs
}
/
${
sfs
}
/
${
sfs
}
.img"
]]
;
then
...
...
initcpio/hooks/miso_pxe_http
View file @
4134a2db
...
...
@@ -40,7 +40,7 @@ miso_pxe_http_mount_handler () {
local
_src
=
${
miso_http_srv
}${
misobasedir
}
/
${
arch
}
for
sfs
in
livefs mhwdfs desktopfs rootfs
;
do
for
sfs
in
livefs mhwdfs desktopfs rootfs
;
do
if
[[
!
-z
"
$(
curl
-L
-s
--head
"
${
_src
}
/
${
sfs
}
.sfs"
|
grep
"OK"
)
"
]]
;
then
_curl_get
"
${
_src
}
/
${
sfs
}
.sfs"
"/
${
arch
}
"
...
...
lib/util-iso.sh
View file @
4134a2db
...
...
@@ -225,7 +225,7 @@ gen_iso_fn(){
!
[[
${
full_iso
}
]]
&&
vars+
=(
"minimal"
)
vars+
=(
"
${
target_arch
}
"
)
for
n
in
${
vars
[@]
}
;
do
for
n
in
${
vars
[@]
}
;
do
name
=
${
name
:-}${
name
:+-
}${
n
}
done
echo
$name
...
...
lib/util-mount.sh
View file @
4134a2db
...
...
@@ -49,7 +49,7 @@ select_os(){
if
[[
${
count
}
>
1
]]
;
then
msg
"Detected systems:"
local
i
=
0
for
os
in
${
os_list
[@]
}
;
do
for
os
in
${
os_list
[@]
}
;
do
local
last
=
${
os
##*
:
}
case
$last
in
'efi'
)
count
=
$((
count-1
))
;;
...
...
lib/util-pkg-chroot.sh
View file @
4134a2db
...
...
@@ -156,7 +156,7 @@ archive_logs(){
post_build
(){
source
PKGBUILD
local
ext
=
'pkg.tar.xz'
tarch ver src
for
pkg
in
${
pkgname
[@]
}
;
do
for
pkg
in
${
pkgname
[@]
}
;
do
case
$arch
in
any
)
tarch
=
'any'
;;
*
)
tarch
=
${
target_arch
}
...
...
lib/util-pkgtree.sh
View file @
4134a2db
...
...
@@ -37,7 +37,7 @@ clone_tree(){
sync_tree_manjaro
(){
cd
${
tree_dir
}
for
repo
in
${
repo_tree
[@]
}
;
do
for
repo
in
${
repo_tree
[@]
}
;
do
if
[[
-d
packages-
${
repo
}
]]
;
then
cd
packages-
${
repo
}
sync_tree
"
${
repo
}
"
...
...
@@ -52,7 +52,7 @@ sync_tree_manjaro(){
sync_tree_abs
(){
local
repo_tree_abs
=(
'packages'
'community'
)
cd
${
tree_dir_abs
}
for
repo
in
${
repo_tree_abs
[@]
}
;
do
for
repo
in
${
repo_tree_abs
[@]
}
;
do
if
[[
-d
${
repo
}
]]
;
then
cd
${
repo
}
sync_tree
"
${
repo
}
"
...
...
lib/util-publish.sh
View file @
4134a2db
...
...
@@ -19,7 +19,7 @@ make_torrent(){
find
${
src_dir
}
-type
f
-name
"*.torrent"
-delete
if
[[
-n
$(
find
${
src_dir
}
-type
f
-name
"*.iso"
)
]]
;
then
for
iso
in
$(
ls
${
src_dir
}
/
*
.iso
)
;
do
for
iso
in
$(
ls
${
src_dir
}
/
*
.iso
)
;
do
local
seed
=
https://
${
host
}
/projects/
${
project
}
/storage/
${
profile
}
/
${
dist_release
}
/
${
iso
##*/
}
local
mktorrent_args
=(
-c
"
${
torrent_meta
}
"
-p
-l
${
piece_size
}
-a
${
tracker_url
}
-w
${
seed
}
)
${
verbose
}
&&
mktorrent_args+
=(
-v
)
...
...
lib/util-yaml.sh
View file @
4134a2db
...
...
@@ -74,7 +74,7 @@ write_services_conf(){
echo
'---'
>
"
$conf
"
echo
''
>>
"
$conf
"
echo
'services:'
>
"
$conf
"
for
s
in
${
enable_systemd
[@]
}
;
do
for
s
in
${
enable_systemd
[@]
}
;
do
echo
" - name:
$s
"
>>
"
$conf
"
echo
' mandatory: false'
>>
"
$conf
"
echo
''
>>
"
$conf
"
...
...
@@ -84,7 +84,7 @@ write_services_conf(){
echo
' mandatory: true'
>>
"
$conf
"
echo
''
>>
"
$conf
"
echo
'disable:'
>>
"
$conf
"
for
s
in
${
disable_systemd
[@]
}
;
do
for
s
in
${
disable_systemd
[@]
}
;
do
echo
" - name:
$s
"
>>
"
$conf
"
echo
' mandatory: false'
>>
"
$conf
"
echo
''
>>
"
$conf
"
...
...
@@ -134,7 +134,7 @@ write_users_conf(){
echo
"---"
>
"
$conf
"
echo
"defaultGroups:"
>>
"
$conf
"
local
IFS
=
','
for
g
in
${
addgroups
[@]
}
;
do
for
g
in
${
addgroups
[@]
}
;
do
echo
" -
$g
"
>>
"
$conf
"
done
unset
IFS
...
...
@@ -232,7 +232,7 @@ get_yaml(){
args+
=(
"
${
profile
}
/packages"
)
fi
args+
=(
"systemd"
)
for
arg
in
${
args
[@]
}
;
do
for
arg
in
${
args
[@]
}
;
do
yaml
=
${
yaml
:-}${
yaml
:+-
}${
arg
}
done
echo
"
${
yaml
}
.yaml"
...
...
@@ -395,7 +395,7 @@ write_netgroup_yaml(){
echo
" hidden: false"
>>
"
$2
"
echo
" critical: false"
>>
"
$2
"
echo
" packages:"
>>
"
$2
"
for
p
in
${
packages
[@]
}
;
do
for
p
in
${
packages
[@]
}
;
do
echo
" -
$p
"
>>
"
$2
"
done
${
validate
}
&&
check_yaml
"
$2
"
...
...
lib/util.sh
View file @
4134a2db
...
...
@@ -729,7 +729,7 @@ is_valid_branch(){
run
(){
if
${
is_build_list
}
;
then
for
item
in
${
build_list
[@]
}
;
do
for
item
in
${
build_list
[@]
}
;
do
$1
$item
done
else
...
...
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