From 3cca47b0f1db0934f1f2a9fb2139bfa14ebe221d Mon Sep 17 00:00:00 2001 From: listbot Date: Thu, 15 Nov 2018 10:51:45 +0000 Subject: [PATCH] tweaking testing: upgrade without interactions remove version pinning on tools --- iso/installer/install.sh | 2 +- update.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/iso/installer/install.sh b/iso/installer/install.sh index e945f00b..0e20480a 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -550,7 +550,7 @@ sed -i '/cdrom/d' /etc/apt/sources.list echo "UseRoaming no" 2>&1 | tee -a /etc/ssh/ssh_config | dialog --title "[ Turn SSH roaming off ]" $myPROGRESSBOXCONF # Installing ctop, elasticdump, tpot, yq -npm install https://github.com/taskrabbit/elasticsearch-dump#9fcc8cc -g 2>&1 | dialog --title "[ Installing elasticsearch-dump ]" $myPROGRESSBOXCONF +npm install https://github.com/taskrabbit/elasticsearch-dump -g 2>&1 | dialog --title "[ Installing elasticsearch-dump ]" $myPROGRESSBOXCONF pip install --upgrade pip 2>&1 | dialog --title "[ Installing pip ]" $myPROGRESSBOXCONF hash -r 2>&1 | dialog --title "[ Installing pip ]" $myPROGRESSBOXCONF pip install elasticsearch-curator yq 2>&1 | dialog --title "[ Installing elasticsearch-curator, yq ]" $myPROGRESSBOXCONF diff --git a/update.sh b/update.sh index e842ac98..9a5dcd4f 100755 --- a/update.sh +++ b/update.sh @@ -157,7 +157,7 @@ echo } function fuUPDATER () { -local myPACKAGES="apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker curl dialog dnsutils docker.io docker-compose dstat ethtool fail2ban genisoimage git glances grc html2text htop ifupdown iptables iw jq libcrack2 libltdl7 lm-sensors man multitail net-tools npm ntp openssh-server openssl pass prips syslinux psmisc pv python-pip unattended-upgrades unzip vim wireless-tools wpasupplicant" +local myPACKAGES="apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker curl dialog dnsutils docker.io docker-compose dstat ethtool fail2ban genisoimage git glances grc html2text htop ifupdown iptables iw jq libcrack2 libltdl7 lm-sensors man mosh multitail net-tools npm ntp openssh-server openssl pass prips syslinux psmisc pv python-pip unattended-upgrades unzip vim wireless-tools wpasupplicant" echo "### Now upgrading packages ..." apt-get -y autoclean apt-get -y autoremove @@ -165,9 +165,9 @@ apt-get update apt-get -y install $myPACKAGES # Some updates require interactive attention, you can override that for unattended upgrades. # Be warned, this can easily break your system. -# apt-get dist-upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes -apt-get -y dist-upgrade -npm install "https://github.com/taskrabbit/elasticsearch-dump#9fcc8cc" -g +apt-get dist-upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes +#apt-get -y dist-upgrade +npm install "https://github.com/taskrabbit/elasticsearch-dump" -g pip install --upgrade pip hash -r pip install --upgrade elasticsearch-curator yq