forked from mirrored-repos/manjaro-tools
corrections and some sortings
This commit is contained in:
parent
9aefc30a38
commit
14ff48abe0
8 changed files with 12 additions and 14 deletions
|
@ -55,11 +55,11 @@ opts=':C:cdGiM'
|
||||||
|
|
||||||
while getopts ${opts} arg; do
|
while getopts ${opts} arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
|
c) hostcache=true ;;
|
||||||
C) pacman_config=$OPTARG ;;
|
C) pacman_config=$OPTARG ;;
|
||||||
d) directory=true ;;
|
d) directory=true ;;
|
||||||
c) hostcache=true ;;
|
|
||||||
i) interactive=true ;;
|
|
||||||
G) copykeyring=false ;;
|
G) copykeyring=false ;;
|
||||||
|
i) interactive=true ;;
|
||||||
M) copymirrorlist=false ;;
|
M) copymirrorlist=false ;;
|
||||||
:) echo "invalid argument ${arg}:$OPTARG"; usage 1;;
|
:) echo "invalid argument ${arg}:$OPTARG"; usage 1;;
|
||||||
?) usage 0 ;;
|
?) usage 0 ;;
|
||||||
|
|
|
@ -138,7 +138,6 @@ while getopts "${opts}" arg; do
|
||||||
c) clean_first=false ;;
|
c) clean_first=false ;;
|
||||||
f) full_iso=true ;;
|
f) full_iso=true ;;
|
||||||
g) gpgkey="$OPTARG" ;;
|
g) gpgkey="$OPTARG" ;;
|
||||||
h|?) usage 0 ;;
|
|
||||||
k) kernel="$OPTARG" ;;
|
k) kernel="$OPTARG" ;;
|
||||||
m) persist=true ;;
|
m) persist=true ;;
|
||||||
p) build_list_iso="$OPTARG" ;;
|
p) build_list_iso="$OPTARG" ;;
|
||||||
|
@ -148,6 +147,7 @@ while getopts "${opts}" arg; do
|
||||||
v) verbose=true ;;
|
v) verbose=true ;;
|
||||||
x) images_only=true ;;
|
x) images_only=true ;;
|
||||||
z) iso_only=true ;;
|
z) iso_only=true ;;
|
||||||
|
h|?) usage 0 ;;
|
||||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
|
@ -109,7 +109,6 @@ while getopts "${opts}" arg; do
|
||||||
a) target_arch="$OPTARG" ;;
|
a) target_arch="$OPTARG" ;;
|
||||||
b) target_branch="$OPTARG" ;;
|
b) target_branch="$OPTARG" ;;
|
||||||
c) clean_first=true ;;
|
c) clean_first=true ;;
|
||||||
h|?) usage 0 ;;
|
|
||||||
i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I ${install_pkgs[*]}) ;;
|
i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I ${install_pkgs[*]}) ;;
|
||||||
n) namcap=true; mkchrootpkg_args+=(-n) ;;
|
n) namcap=true; mkchrootpkg_args+=(-n) ;;
|
||||||
p) build_list_pkg="${OPTARG%/}" ;;
|
p) build_list_pkg="${OPTARG%/}" ;;
|
||||||
|
@ -117,6 +116,7 @@ while getopts "${opts}" arg; do
|
||||||
r) chroots_pkg="$OPTARG" ;;
|
r) chroots_pkg="$OPTARG" ;;
|
||||||
s) sign=true ;;
|
s) sign=true ;;
|
||||||
w) wipe_clean=true ;;
|
w) wipe_clean=true ;;
|
||||||
|
h|?) usage 0 ;;
|
||||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
|
@ -61,10 +61,10 @@ opts='sacqh'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
s) sync=true ;;
|
|
||||||
a) abs=true ;;
|
a) abs=true ;;
|
||||||
c) clean=true ;;
|
c) clean=true ;;
|
||||||
q) pretend=true ;;
|
q) pretend=true ;;
|
||||||
|
s) sync=true ;;
|
||||||
h|?) usage 0 ;;
|
h|?) usage 0 ;;
|
||||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -113,11 +113,11 @@ while getopts "${opts}" arg; do
|
||||||
a) target_arch="$OPTARG" ;;
|
a) target_arch="$OPTARG" ;;
|
||||||
c) calamares=true ;;
|
c) calamares=true ;;
|
||||||
g) group=true ;;
|
g) group=true ;;
|
||||||
h|?) usage 0 ;;
|
|
||||||
k) kernel="$OPTARG" ;;
|
k) kernel="$OPTARG" ;;
|
||||||
p) build_list_iso="$OPTARG" ;;
|
p) build_list_iso="$OPTARG" ;;
|
||||||
q) pretend=true ;;
|
q) pretend=true ;;
|
||||||
v) validate=true ;;
|
v) validate=true ;;
|
||||||
|
h|?) usage 0 ;;
|
||||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
|
@ -91,12 +91,12 @@ opts='p:l:uvtqh'
|
||||||
|
|
||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
p) build_list_iso="$OPTARG" ;;
|
|
||||||
l) limit="$OPTARG" ;;
|
l) limit="$OPTARG" ;;
|
||||||
u) update=true; rsync_args+=(-u) ;;
|
p) build_list_iso="$OPTARG" ;;
|
||||||
t) torrent=true ;;
|
|
||||||
v) verbose=true; rsync_args+=(-v --stats) ;;
|
|
||||||
q) pretend=true; rsync_args+=(-n) ;;
|
q) pretend=true; rsync_args+=(-n) ;;
|
||||||
|
t) torrent=true ;;
|
||||||
|
u) update=true; rsync_args+=(-u) ;;
|
||||||
|
v) verbose=true; rsync_args+=(-v --stats) ;;
|
||||||
h|?) usage 0 ;;
|
h|?) usage 0 ;;
|
||||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -43,8 +43,8 @@ pretend=false
|
||||||
usage() {
|
usage() {
|
||||||
echo "usage: ${0##*/} -a [or] ${0##*/} chroot-dir [command]"
|
echo "usage: ${0##*/} -a [or] ${0##*/} chroot-dir [command]"
|
||||||
echo ' -a Automount detected linux system'
|
echo ' -a Automount detected linux system'
|
||||||
echo ' -q Query settings and pretend'
|
|
||||||
echo ' -h Print this help message'
|
echo ' -h Print this help message'
|
||||||
|
echo ' -q Query settings and pretend'
|
||||||
echo ''
|
echo ''
|
||||||
echo " If 'command' is unspecified, ${0##*/} will launch /bin/sh."
|
echo " If 'command' is unspecified, ${0##*/} will launch /bin/sh."
|
||||||
echo ''
|
echo ''
|
||||||
|
|
|
@ -584,8 +584,6 @@ load_pkgs(){
|
||||||
| sed "$_space" \
|
| sed "$_space" \
|
||||||
| sed "$_blacklist" \
|
| sed "$_blacklist" \
|
||||||
| sed "$_purge" \
|
| sed "$_purge" \
|
||||||
| sed "$_init" \
|
|
||||||
| sed "$_init_rm" \
|
|
||||||
| sed "$_arch" \
|
| sed "$_arch" \
|
||||||
| sed "$_arch_rm" \
|
| sed "$_arch_rm" \
|
||||||
| sed "$_nonfree_default" \
|
| sed "$_nonfree_default" \
|
||||||
|
|
Loading…
Reference in a new issue