Merge remote-tracking branch 'github/master' into vim8
This commit is contained in:
commit
0d17c814dd
2 changed files with 3 additions and 2 deletions
|
@ -19,6 +19,7 @@ if [[ -z $DONT_CHANGE_SHELL ]]; then
|
|||
fi
|
||||
|
||||
CURL="curl -sSf"
|
||||
jobs_count=`nproc`
|
||||
|
||||
if [[ -z $DIR ]]; then
|
||||
echo "please set DIR"
|
||||
|
@ -96,7 +97,7 @@ if [[ -z $NORUST ]]; then
|
|||
git pull
|
||||
git submodule update --init --recursive
|
||||
fi
|
||||
cargo install -f rustfmt
|
||||
cargo install -j $jobs_count -f rustfmt
|
||||
fi
|
||||
|
||||
if [[ -z $NORUBY ]]; then
|
||||
|
|
|
@ -4,7 +4,7 @@ set -e
|
|||
|
||||
#software and shell
|
||||
sudo dnf -y upgrade --best --allowerasing
|
||||
sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils ncurses-devel
|
||||
sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel
|
||||
FEDORA_VERSION=`rpm -E %fedora`
|
||||
sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm
|
||||
sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm
|
||||
|
|
Loading…
Reference in a new issue