Build in parallel and tolerate broken install symlinks
This commit is contained in:
1 parent
8ef25d0d31
commit
aaa2f208d6
5 files changed
+16
-2
No files matched your search
@@ -0,0 +1 @@
|
|||||||
|
MAKEFLAGS="-j$(nproc)"
|
||||||
@@ -80,6 +80,7 @@ install_bar_widgets
|
|||||||
remove_omarchy_font
|
remove_omarchy_font
|
||||||
refresh_font_cache
|
refresh_font_cache
|
||||||
install_shell_profile
|
install_shell_profile
|
||||||
|
install_makepkg_config
|
||||||
install_bash_integration
|
install_bash_integration
|
||||||
install_user_units
|
install_user_units
|
||||||
install_systemd_dropins
|
install_systemd_dropins
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
# having run first.
|
# having run first.
|
||||||
link_blob_path() {
|
link_blob_path() {
|
||||||
local current=""
|
local current=""
|
||||||
[[ -L $blob_path ]] && current="$(readlink -f "$blob_path")"
|
[[ -L $blob_path ]] && current="$(readlink -f "$blob_path" || true)"
|
||||||
|
|
||||||
if [[ $current == "$repo_dir" ]]; then
|
if [[ $current == "$repo_dir" ]]; then
|
||||||
say "ok BLOB_PATH -> $repo_dir"
|
say "ok BLOB_PATH -> $repo_dir"
|
||||||
@@ -125,6 +125,11 @@ install_shell_profile() {
|
|||||||
install_root_file "$repo_dir/session/profile.sh" /etc/profile.d/blob.sh "profile.d/blob.sh"
|
install_root_file "$repo_dir/session/profile.sh" /etc/profile.d/blob.sh "profile.d/blob.sh"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
install_makepkg_config() {
|
||||||
|
install_root_file "$repo_dir/default/makepkg/blob-parallel.conf" \
|
||||||
|
/etc/makepkg.conf.d/blob-parallel.conf "makepkg.conf.d/blob-parallel.conf"
|
||||||
|
}
|
||||||
|
|
||||||
install_zen_config() {
|
install_zen_config() {
|
||||||
local profile
|
local profile
|
||||||
profile="$(find "$config_dir/zen" -maxdepth 1 -type d -name '*.Default (release)*' 2>/dev/null | head -1)"
|
profile="$(find "$config_dir/zen" -maxdepth 1 -type d -name '*.Default (release)*' 2>/dev/null | head -1)"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ link_wallpapers() {
|
|||||||
local source="$repo_dir/wallpapers"
|
local source="$repo_dir/wallpapers"
|
||||||
local current=""
|
local current=""
|
||||||
|
|
||||||
[[ -L $wallpaper_dir ]] && current="$(readlink -f "$wallpaper_dir")"
|
[[ -L $wallpaper_dir ]] && current="$(readlink -f "$wallpaper_dir" || true)"
|
||||||
|
|
||||||
if [[ $current == "$source" ]]; then
|
if [[ $current == "$source" ]]; then
|
||||||
say "ok wallpapers"
|
say "ok wallpapers"
|
||||||
|
|||||||
@@ -14,3 +14,10 @@ case ":$PATH:" in
|
|||||||
*) PATH="${PATH:+$PATH:}$HOME/.local/bin" ;;
|
*) PATH="${PATH:+$PATH:}$HOME/.local/bin" ;;
|
||||||
esac
|
esac
|
||||||
export PATH
|
export PATH
|
||||||
|
|
||||||
|
cpu_cores=$(nproc 2>/dev/null || echo 1)
|
||||||
|
: "${MAKEFLAGS:=-j$cpu_cores}"
|
||||||
|
: "${CMAKE_BUILD_PARALLEL_LEVEL:=$cpu_cores}"
|
||||||
|
: "${CARGO_BUILD_JOBS:=$cpu_cores}"
|
||||||
|
export MAKEFLAGS CMAKE_BUILD_PARALLEL_LEVEL CARGO_BUILD_JOBS
|
||||||
|
unset cpu_cores
|
||||||
Reference in new issue
Block a user