diff options
| -rw-r--r-- | zirless.sh | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -129,12 +129,6 @@ aurinstall() { \ sudo -u "$name" $aurhelper -S --noconfirm "$1" >/dev/null 2>&1 } -pipinstall() { \ - dialog --title "ZIRLESS Installation" --infobox "Installing the Python package \`$1\` ($n of $total). $1 $2" 5 70 - [ -x "$(command -v "pip")" ] || installpkg python-pip >/dev/null 2>&1 - yes | pip install "$1" - } - installationloop() { \ ([ -f "$progsfile" ] && cp "$progsfile" /tmp/progs.csv) || curl -Ls "$progsfile" | sed '/^#/d' > /tmp/progs.csv total=$(wc -l < /tmp/progs.csv) @@ -146,7 +140,6 @@ installationloop() { \ "A") aurinstall "$program" "$comment" ;; "G") gitmakeinstall "$program" "$comment" ;; "M") gitmakepkginstall "$program" "$comment" ;; - "P") pipinstall "$program" "$comment" ;; *) maininstall "$program" "$comment" ;; esac done < /tmp/progs.csv ;} @@ -159,6 +152,9 @@ putgitrepo() { # Downloads a gitrepo $1 and places the files in $2 only overwrit chown "$name":"$name" "$dir" "$2" sudo -u "$name" git clone --recursive -b "$branch" --depth 1 --recurse-submodules "$1" "$dir" >/dev/null 2>&1 sudo -u "$name" cp -rfT "$dir" "$2" + pushd "$2" + sudo -u "$name" make install + popd } systembeepoff() { dialog --infobox "Getting rid of that retarded error beep sound..." 10 50 @@ -232,7 +228,7 @@ dialog --title "ZIRLESS Installation" --infobox "Finally, installing \`libxft-bg yes | sudo -u "$name" $aurhelper -S libxft-bgra-git >/dev/null 2>&1 # Install the dotfiles in the user's home directory -putgitrepo "$dotfilesrepo" "/home/$name" "$repobranch" +putgitrepo "$dotfilesrepo" "/home/$name/.config" "$repobranch" rm -f "/home/$name/README.md" "/home/$name/LICENSE" "/home/$name/FUNDING.yml" # Create default urls file if none exists. [ ! -f "/home/$name/.config/newsboat/urls" ] && echo "http://lukesmith.xyz/rss.xml |