0.7.0 release fixer-upper

Difegue · May 21, 2020 · 7752c15 · 7752c15
2 parents 976fd13 + 9e89ddd
commit 7752c15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/tools/build/docker/install-everything.sh b/tools/build/docker/install-everything.sh
@@ -10,12 +10,9 @@ apk add shadow s6 s6-portable-utils
 #Hey it's cpanm
 curl -L https://cpanmin.us | perl - App::cpanminus
 
-#Install Linux::Inotify2 manually since we don't run the full installer in a Docker context
-cpanm Linux::Inotify2
-
 #Install the LRR dependencies proper
 cd tools && cpanm --notest --installdeps . -M https://cpan.metacpan.org && cd ..
-npm run lanraragi-installer install-front
+npm run lanraragi-installer install-full
 
 #Cleanup to lighten the image
 apk del perl-dev g++ make gnupg wget curl nodejs nodejs-npm openssl-dev

diff --git a/tools/install.pl b/tools/install.pl
@@ -208,11 +208,9 @@ sub install_package {
     ## use critic
 
     if ($@) {
-        say("$package not installed! Trying to install now using cpanm $cpanopt .");
+        say("$package not installed! Trying to install now using cpanm$cpanopt");
         system("cpanm $package $cpanopt");
-        require $package;
     } else {
         say("$package package installed, proceeding...");
     }
-
 }