From ab8274eae2b9b21c99e02a030955d0b58ed681e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Suzanne=20Dup=C3=A9ron?= <ligo@suzanne.soy>
Date: Wed, 4 Mar 2020 14:51:13 +0100
Subject: [PATCH] Install perl6 instead of the painful-to-install
 python3+fstrings

---
 scripts/install_build_environment.sh    | 8 ++------
 scripts/install_native_dependencies.sh  | 8 ++------
 src/stages/adt_generator/README         | 2 +-
 src/stages/adt_generator/generator.raku | 3 +--
 tools/webide/Dockerfile                 | 3 +--
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/scripts/install_build_environment.sh b/scripts/install_build_environment.sh
index 2d2732ba1..7a52cf684 100755
--- a/scripts/install_build_environment.sh
+++ b/scripts/install_build_environment.sh
@@ -22,8 +22,7 @@ echo "Installing dependencies.."
 if [ -n "`uname -a | grep -i arch`" ]
 then
     sudo pacman -Sy --noconfirm \
-        python \
-        python-pip \
+        rakudo \
         make \
         m4 \
         gcc \
@@ -36,8 +35,7 @@ fi
 if [ -n "`uname -a | grep -i ubuntu`" ]
 then
 sudo apt-get install -y make \
-     python3 \
-     python3-pip \
+     perl6 \
      make \
      m4 \
      gcc \
@@ -47,8 +45,6 @@ sudo apt-get install -y make \
      curl
 fi
 
-pip3 install future-fstrings
-
 if [ -n "`uname -a | grep -i ubuntu`" ]
 then
     echo "ubuntu"
diff --git a/scripts/install_native_dependencies.sh b/scripts/install_native_dependencies.sh
index 7bba33e4b..9156cd823 100755
--- a/scripts/install_native_dependencies.sh
+++ b/scripts/install_native_dependencies.sh
@@ -7,8 +7,7 @@ if [ $ID = arch ]
 then
     pacman -Sy
     sudo pacman -S --noconfirm \
-        python \
-        python-pip \
+        rakudo \
         libevdev \
         perl \
         pkg-config \
@@ -23,8 +22,7 @@ then
 else
     apt-get update -qq
     apt-get -y -qq install \
-        python3 \
-        python3-pip \
+        perl6 \
         libev-dev \
         perl \
         pkg-config \
@@ -36,5 +34,3 @@ else
         rsync \
         git
 fi
-
-pip3 install future-fstrings
diff --git a/src/stages/adt_generator/README b/src/stages/adt_generator/README
index 569519323..2463bd663 100644
--- a/src/stages/adt_generator/README
+++ b/src/stages/adt_generator/README
@@ -4,4 +4,4 @@ Build & test with:
 
 Run with
 
-    python3 ./generator.py
+    perl6 ./generator.raku amodule.ml
diff --git a/src/stages/adt_generator/generator.raku b/src/stages/adt_generator/generator.raku
index 7f5d6b797..86099df53 100644
--- a/src/stages/adt_generator/generator.raku
+++ b/src/stages/adt_generator/generator.raku
@@ -1,7 +1,6 @@
 #!/usr/bin/env perl6
-use strict;
-use v6;
 use v6.c;
+use strict;
 use worries;
 
 my $moduleName = @*ARGS[0].subst(/\.ml$/, '').samecase("A_");
diff --git a/tools/webide/Dockerfile b/tools/webide/Dockerfile
index 45d320aa5..166432acb 100644
--- a/tools/webide/Dockerfile
+++ b/tools/webide/Dockerfile
@@ -21,8 +21,7 @@ FROM node:12-buster
 
 WORKDIR /app
 
-RUN apt-get update && apt-get -y install python3 python3-pip libev-dev perl pkg-config libgmp-dev libhidapi-dev m4 libcap-dev bubblewrap rsync
-RUN pip3 install future-fstrings
+RUN apt-get update && apt-get -y install perl6 libev-dev perl pkg-config libgmp-dev libhidapi-dev m4 libcap-dev bubblewrap rsync
 
 COPY ligo_deb10.deb /tmp/ligo_deb10.deb
 RUN dpkg -i /tmp/ligo_deb10.deb && rm /tmp/ligo_deb10.deb