bug fixed in print_block
This commit is contained in:
parent
f733e75c1d
commit
1725e27fa1
@ -45,13 +45,12 @@ print_block ()
|
|||||||
{
|
{
|
||||||
local ln=$(get_line)
|
local ln=$(get_line)
|
||||||
if [[ "$ln" -lt "$(($LINES - $STEPS))" ]];then
|
if [[ "$ln" -lt "$(($LINES - $STEPS))" ]];then
|
||||||
tput csr 0 $LINES
|
|
||||||
tput cup $(($LINES - $STEPS - 2)) 0
|
tput cup $(($LINES - $STEPS - 2)) 0
|
||||||
else
|
else
|
||||||
ln=$(($LINES - $STEPS - 1))
|
ln=$(($LINES - $STEPS - 1))
|
||||||
fi
|
fi
|
||||||
echo "..........................................................."
|
echo "..........................................................."
|
||||||
for i in $(seq 1 12)
|
for i in $(seq 1 $STEPS)
|
||||||
do
|
do
|
||||||
echo -n " >"
|
echo -n " >"
|
||||||
tput el
|
tput el
|
||||||
@ -141,8 +140,8 @@ new_line "Install base packages"
|
|||||||
if ! type nix &> /dev/null
|
if ! type nix &> /dev/null
|
||||||
then
|
then
|
||||||
new_line "Install nix packet manager (single user)"
|
new_line "Install nix packet manager (single user)"
|
||||||
bash <(curl --silent -L https://nixos.org/nix/install) --no-daemon 2>&1|pad
|
bash <(curl --silent -L https://nixos.org/nix/install) --no-daemon 2>&1|pad
|
||||||
. ~/.nix-profile/etc/profile.d/nix.sh 2>&1|pad
|
source ~/.nix-profile/etc/profile.d/nix.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -188,18 +187,23 @@ new_line "via NIX"
|
|||||||
nix-env -iA nixpkgs.atuin nixpkgs.jump nixpkgs.du-dust nixpkgs.lazygit 2>&1|pad
|
nix-env -iA nixpkgs.atuin nixpkgs.jump nixpkgs.du-dust nixpkgs.lazygit 2>&1|pad
|
||||||
|
|
||||||
{{ else if eq .chezmoi.osRelease.id "arch" -}}
|
{{ else if eq .chezmoi.osRelease.id "arch" -}}
|
||||||
|
new_line "via Pacman"
|
||||||
sudo pacman -Sy --noconfirm neovim fish atuin $ACT_PACKAGES fd skim lazygit 2>&1|pad
|
sudo pacman -Sy --noconfirm neovim fish atuin $ACT_PACKAGES fd skim lazygit 2>&1|pad
|
||||||
|
new_line "via NIX"
|
||||||
nix-env -iA nixpkgs.jump nixpkgs.du-dust 2>&1|pad
|
nix-env -iA nixpkgs.jump nixpkgs.du-dust 2>&1|pad
|
||||||
|
|
||||||
{{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}}
|
{{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}}
|
||||||
sudo apt install fish neovim $ACT_PACKAGES libpam-ssh-agent-auth -y 2>&1|pad
|
new_line "via APT"
|
||||||
|
sudo apt-get install fish neovim $ACT_PACKAGES libpam-ssh-agent-auth -y 2>&1|pad
|
||||||
|
|
||||||
|
new_line "via NIX"
|
||||||
|
nix-env -iA nixpkgs.neovim nixpkgs.jump nixpkgs.skim nixpkgs.du-dust nixpkgs.atuin 2>&1|pad
|
||||||
|
|
||||||
|
new_line "manually installing LazyGit"
|
||||||
LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep -Po '"tag_name": "v\K[^"]*')
|
LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep -Po '"tag_name": "v\K[^"]*')
|
||||||
curl --silent -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" 2>&1|pad
|
curl --silent -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" 2>&1|pad
|
||||||
tar xf lazygit.tar.gz lazygit 2>&1|pad
|
tar xf lazygit.tar.gz lazygit 2>&1|pad
|
||||||
sudo install lazygit /usr/local/bin 2>&1|pad
|
sudo install lazygit /usr/local/bin 2>&1|pad
|
||||||
|
|
||||||
nix-env -iA nixpkgs.neovim nixpkgs.jump nixpkgs.skim nixpkgs.du-dust nixpkgs.atuin 2>&1|pad
|
|
||||||
{{ end -}}
|
{{ end -}}
|
||||||
|
|
||||||
{{ if eq .chezmoi.os "linux" -}}
|
{{ if eq .chezmoi.os "linux" -}}
|
||||||
|
Loading…
Reference in New Issue
Block a user