diff --git a/scripts/docker-install-phase4.bash b/scripts/docker-install-phase4.bash index 2c9f416..7c50313 100755 --- a/scripts/docker-install-phase4.bash +++ b/scripts/docker-install-phase4.bash @@ -163,9 +163,10 @@ chmod +x /usr/local/bin/kitten ver="$(latest_release JetBrains/kotlin)" wget -nv "https://github.com/JetBrains/kotlin/releases/download/${ver}/kotlin-compiler-$(sed 's/^v//' <<< "$ver").zip" unzip kotlin-*.zip -cp kotlinc/bin/* /usr/local/bin/ -cp kotlinc/lib/* /usr/local/lib/ -rm -rf kotlin-*.zip kotlinc +mv kotlinc /opt/kotlin +ln -s /opt/kotlin/bin/* /usr/local/bin/ +ln -s /opt/kotlin/lib/* /usr/local/lib/ +rm kotlin-*.zip # Lua ver="$(latest_release EmmyLua/EmmyLua-LanguageServer)" diff --git a/scripts/docker-install-phase6.bash b/scripts/docker-install-phase6.bash index bcbaf40..cf2c190 100755 --- a/scripts/docker-install-phase6.bash +++ b/scripts/docker-install-phase6.bash @@ -33,7 +33,7 @@ pushd kalyn >/dev/null stack build kalyn mv "$(stack exec which kalyn)" /usr/local/bin/kalyn mkdir /opt/kalyn -cp -R src-kalyn/Stdlib src-kalyn/Stdlib.kalyn /opt/kalyn/ +mv src-kalyn/Stdlib src-kalyn/Stdlib.kalyn /opt/kalyn/ popd >/dev/null rm -rf kalyn diff --git a/scripts/docker-install-phase7.bash b/scripts/docker-install-phase7.bash index 092c6ee..420214e 100755 --- a/scripts/docker-install-phase7.bash +++ b/scripts/docker-install-phase7.bash @@ -9,7 +9,7 @@ useradd -m -N -l -r -p '!' build # Cmd sudo -u build wine cmd < /dev/null mkdir -p /opt/cmd/home-template -cp -R /home/build/.wine /opt/cmd/home-template/ +mv /home/build/.wine /opt/cmd/home-template/ chmod -R a=u,go-w /opt/cmd/home-template # Elm