summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-07-07 17:50:12 -0600
committermo khan <mo.khan@gmail.com>2020-07-09 13:52:33 -0600
commit5500e3d86d41eca515bfc7b481dc59702553b59f (patch)
treed8e1b690b2008f1a027a1fd028e3b40569e8d6db
parent2bc8522495d25ac6ef984883bf98f398a4ff436c (diff)
Remove GUI packages, install dotnet at scan time
-rw-r--r--config/install.sh5
-rw-r--r--lib/license/finder/ext.rb1
-rw-r--r--lib/license/finder/ext/dotnet.rb11
-rw-r--r--lib/license/finder/ext/nuget.rb2
4 files changed, 17 insertions, 2 deletions
diff --git a/config/install.sh b/config/install.sh
index 2868c94..f2a7d5e 100644
--- a/config/install.sh
+++ b/config/install.sh
@@ -81,8 +81,6 @@ wget -q -O /etc/apt/sources.list.d/microsoft-prod.list https://packages.microsof
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
echo "deb https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list
-apt-get update -q
-apt-get install -y --no-install-recommends dotnet-sdk-3.1 mono-complete &
curl -o /usr/local/bin/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe &
echo -e "section_end:$(date +%s):install_dotnet\r\e[0K"
@@ -112,6 +110,9 @@ wait
echo -e "section_end:$(date +%s):install_asdf\r\e[0K"
echo -e "section_start:$(date +%s):cleanup\r\e[0K==> Beginning cleanup…"
+apt purge -y libx11-6 libwayland-client0
+apt autoremove -y
+
rm -fr /tmp
mkdir -p /tmp
chmod 777 /tmp
diff --git a/lib/license/finder/ext.rb b/lib/license/finder/ext.rb
index da6a006..1154a4a 100644
--- a/lib/license/finder/ext.rb
+++ b/lib/license/finder/ext.rb
@@ -4,6 +4,7 @@ require 'license/finder/ext/bower'
require 'license/finder/ext/bundler'
require 'license/finder/ext/conan'
require 'license/finder/ext/dependency'
+require 'license/finder/ext/dotnet'
require 'license/finder/ext/go_modules'
require 'license/finder/ext/gradle'
require 'license/finder/ext/license'
diff --git a/lib/license/finder/ext/dotnet.rb b/lib/license/finder/ext/dotnet.rb
new file mode 100644
index 0000000..1b98881
--- /dev/null
+++ b/lib/license/finder/ext/dotnet.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module LicenseFinder
+ class Dotnet
+ def prepare
+ shell.execute(['apt-get', :update, '-q'])
+ shell.execute(['apt-get', :install, '-y', '--no-install-recommends', 'dotnet-sdk-3.1'])
+ shell.execute([:dotnet, :restore])
+ end
+ end
+end
diff --git a/lib/license/finder/ext/nuget.rb b/lib/license/finder/ext/nuget.rb
index fc06e21..1aa3b1b 100644
--- a/lib/license/finder/ext/nuget.rb
+++ b/lib/license/finder/ext/nuget.rb
@@ -3,6 +3,8 @@
module LicenseFinder
class Nuget
def prepare_command
+ shell.execute(['apt-get', :update, '-q'])
+ shell.execute(['apt-get', :install, '-y', '--no-install-recommends', 'mono-complete'])
"mono /usr/local/bin/nuget.exe restore -Verbosity detailed"
end