forked from artix/artools
Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
922afb4e69 | |||
d22017e1a1 | |||
1ea7d2ca8b | |||
3cd8632c61 | |||
b425eac181 | |||
4b2d516258 |
@@ -28,6 +28,7 @@ artools
|
|||||||
- pkg:
|
- pkg:
|
||||||
* namcap
|
* namcap
|
||||||
* git-subrepo
|
* git-subrepo
|
||||||
|
* jshon
|
||||||
|
|
||||||
- iso:
|
- iso:
|
||||||
* dosfstools
|
* dosfstools
|
||||||
|
@@ -59,7 +59,7 @@ show_deps(){
|
|||||||
|
|
||||||
local archver=$(get_full_version $pkg)
|
local archver=$(get_full_version $pkg)
|
||||||
|
|
||||||
msg "repo: %s" "$repo"
|
msg2 "repo: %s" "$repo"
|
||||||
[[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
|
[[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
|
||||||
msg2 "pkgname: %s" "${pkgname[*]}"
|
msg2 "pkgname: %s" "${pkgname[*]}"
|
||||||
[[ -n $pkgdesc ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
|
[[ -n $pkgdesc ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
|
||||||
@@ -87,7 +87,7 @@ from_arch(){
|
|||||||
|
|
||||||
dest=${TREE_DIR_ARTIX}/$tree_dir/$pkg/trunk
|
dest=${TREE_DIR_ARTIX}/$tree_dir/$pkg/trunk
|
||||||
|
|
||||||
msg "artix tree: %s" "$tree_dir"
|
msg "tree: %s" "$tree_dir"
|
||||||
show_deps "$src" "$repo"
|
show_deps "$src" "$repo"
|
||||||
|
|
||||||
if [[ -d $dest ]];then
|
if [[ -d $dest ]];then
|
||||||
|
@@ -21,7 +21,13 @@ update_repo(){
|
|||||||
|
|
||||||
. PKGBUILD
|
. PKGBUILD
|
||||||
|
|
||||||
for name in ${pkgname[@]};do
|
local pkgsearch=(${pkgname[@]})
|
||||||
|
if check_option "debug" "y"; then
|
||||||
|
pkgbase=${pkgbase:-${pkgname[@]}}
|
||||||
|
pkgsearch+=("${pkgbase}-debug")
|
||||||
|
fi
|
||||||
|
|
||||||
|
for name in ${pkgsearch[@]}; do
|
||||||
pkgarch=$(get_pkg_arch "$name")
|
pkgarch=$(get_pkg_arch "$name")
|
||||||
ver=$(get_full_version "$name")
|
ver=$(get_full_version "$name")
|
||||||
if pkgfile=$(find_cached_package "$name" "$ver" "$pkgarch");then
|
if pkgfile=$(find_cached_package "$name" "$ver" "$pkgarch");then
|
||||||
|
@@ -79,14 +79,14 @@ write_details() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
write_pkg_yaml(){
|
write_pkg_yaml(){
|
||||||
local pkgfile=$(print_all_package_names)
|
local pkgfile=$(makepkg --packagelist)
|
||||||
|
|
||||||
Yaml=$(write_yaml_header)
|
Yaml=$(write_yaml_header)
|
||||||
|
|
||||||
Yaml+=$(write_empty_line)
|
Yaml+=$(write_empty_line)
|
||||||
|
|
||||||
Yaml+=$(write_yaml_map 0 "pkgbase")
|
Yaml+=$(write_yaml_map 0 "pkgbase")
|
||||||
Yaml+=$(write_yaml_map 2 "pkgname" "${pkgbase:-$pkgname}")
|
Yaml+=$(write_yaml_map 2 "pkgname" "${pkgbase:-${pkgname[0]}}")
|
||||||
${details} && write_details ''
|
${details} && write_details ''
|
||||||
|
|
||||||
Yaml+=$(write_empty_line)
|
Yaml+=$(write_empty_line)
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
linux
|
linux
|
||||||
nvidia
|
nvidia
|
||||||
|
nvidia-utils
|
||||||
acpi_call
|
acpi_call
|
||||||
bbswitch
|
bbswitch
|
||||||
broadcom-wl
|
broadcom-wl
|
||||||
|
@@ -61,7 +61,7 @@ subrepo_clone(){
|
|||||||
clone_tree(){
|
clone_tree(){
|
||||||
local timer=$(get_timer) url="$1" tree="$2" os="${3:-$(get_osname)}"
|
local timer=$(get_timer) url="$1" tree="$2" os="${3:-$(get_osname)}"
|
||||||
|
|
||||||
msg "Cloning (%s) ..." "$tree" "$os"
|
msg "Cloning %s (%s) ..." "$tree" "$os"
|
||||||
|
|
||||||
git clone $url/$tree.git
|
git clone $url/$tree.git
|
||||||
show_elapsed_time "${FUNCNAME}" "${timer}"
|
show_elapsed_time "${FUNCNAME}" "${timer}"
|
||||||
|
Reference in New Issue
Block a user