diff --git a/installers/deb/build_deb.sh b/installers/deb/build_deb.sh index 78d45bc9c..dbb6cd48b 100755 --- a/installers/deb/build_deb.sh +++ b/installers/deb/build_deb.sh @@ -71,14 +71,17 @@ popd >/dev/null 2>/dev/null # For linux and wsl create packages for each arch -for wslp in linux wsl +for wslp in linux wsl2 wsl1 do # For each arch create a deb file for arch_base in x86_64^amd64 armv7l^armhf aarch64^arm64 do - if [[ ${wslp} = wsl && ${arch_base} = armv7l^armhf ]]; + if [ "${arch_base}" = armv7l^armhf ] then - continue + if [ "${wslp}" = wsl1 ] || [ "${wslp}" = wsl2 ] + then + continue + fi fi arch=${arch_base%^*} debian_arch=${arch_base#*^} @@ -99,8 +102,14 @@ do MEDLEYDIR=${il_dir#${pkg_dir}}/medley # Maiko and Medley files to il_dir (/usr/local/interlisp) mkdir -p ${il_dir} - tar -x -z -C ${il_dir} \ - -f "${tarball_dir}/maiko-${maiko_release}-linux.${arch}.tgz" + if [ "${wslp}" = wsl1 ] + then + tar -x -z -C ${il_dir} \ + -f "${tarball_dir}/maiko-${maiko_release}-wsl1.${arch}.tgz" + else + tar -x -z -C ${il_dir} \ + -f "${tarball_dir}/maiko-${maiko_release}-linux.${arch}.tgz" + fi tar -x -z -C ${il_dir} \ -f "${tarball_dir}/medley-${medley_release}-runtime.tgz" tar -x -z -C ${il_dir} \ @@ -117,14 +126,17 @@ do sed -e "s>--MEDLEYDIR-->${MEDLEYDIR}>g" ${pkg_dir}/DEBIAN/postrm chmod +x ${pkg_dir}/DEBIAN/postrm # For wsl scripts, include the vncviewer.exe - if [[ ${wslp} = wsl && ${arch} = x86_64 ]]; + if [ "${wslp}" = wsl1 ] || [ "${wslp}" = wsl2 ] then - pushd ./tmp >/dev/null - rm -rf vncviewer64-1.12.0.exe - wget -q https://sourceforge.net/projects/tigervnc/files/stable/1.12.0/vncviewer64-1.12.0.exe - popd >/dev/null - mkdir -p ${il_dir}/wsl - cp -p tmp/vncviewer64-1.12.0.exe ${il_dir}/wsl/vncviewer64-1.12.0.exe + if [ "${arch}" = x86_64 ] + then + pushd ./tmp >/dev/null + rm -rf vncviewer64-1.12.0.exe + wget -q https://sourceforge.net/projects/tigervnc/files/stable/1.12.0/vncviewer64-1.12.0.exe + popd >/dev/null + mkdir -p ${il_dir}/wsl + cp -p tmp/vncviewer64-1.12.0.exe ${il_dir}/wsl/vncviewer64-1.12.0.exe + fi fi # # Make sure all files are owned by root diff --git a/installers/deb/control-wsl b/installers/deb/control-wsl1 similarity index 100% rename from installers/deb/control-wsl rename to installers/deb/control-wsl1 diff --git a/installers/deb/control-wsl2 b/installers/deb/control-wsl2 new file mode 100644 index 000000000..20f76b6eb --- /dev/null +++ b/installers/deb/control-wsl2 @@ -0,0 +1,9 @@ +Package: medley-interlisp +Version: 1.0.0 +Release: --RELEASE-- +Maintainer: info@interlisp.org +Description: Medley Interlisp for Linux +Homepage: https://github.com/interlisp/medley +Architecture: --ARCH-- +Depends: wslu ( >= 4.1 ) | wslu ( << 4.0 ), tigervnc-standalone-server, tigervnc-xorg-extension + diff --git a/scripts/medley/medley.command b/scripts/medley/medley.command index 28ce293f7..d3b3ab681 100755 --- a/scripts/medley/medley.command +++ b/scripts/medley/medley.command @@ -1002,12 +1002,6 @@ do shift done -# if running on WSL1, force use_vnc -if [ "${wsl}" = true ] && [ "${wsl_ver}" -eq 1 ] -then - use_vnc=true -fi - # Process run_id # if it doesn't end in #, make sure that there is not another instance currently running with this same id diff --git a/scripts/medley/medley_args.sh b/scripts/medley/medley_args.sh index eac7baa0e..4d4505c27 100755 --- a/scripts/medley/medley_args.sh +++ b/scripts/medley/medley_args.sh @@ -412,9 +412,3 @@ do shift done -# if running on WSL1, force use_vnc -if [ "${wsl}" = true ] && [ "${wsl_ver}" -eq 1 ] -then - use_vnc=true -fi -