From 9d402428db8d79bf238edfc70cf03b06f67e648f Mon Sep 17 00:00:00 2001
From: Daniel Braun <braundaniel@live.com>
Date: Sun, 20 Aug 2023 11:04:01 +0000
Subject: [PATCH] fix: debian failure to add ppas

---
 src/neovim-apt-get/devcontainer-feature.json    | 2 +-
 src/neovim-apt-get/install.sh                   | 7 ++++---
 test/neovim-apt-get/scenarios.json              | 8 +++++++-
 test/neovim-apt-get/{test.sh => test_debian.sh} | 0
 test/neovim-apt-get/test_ubuntu.sh              | 9 +++++++++
 5 files changed, 21 insertions(+), 5 deletions(-)
 rename test/neovim-apt-get/{test.sh => test_debian.sh} (100%)
 create mode 100755 test/neovim-apt-get/test_ubuntu.sh

diff --git a/src/neovim-apt-get/devcontainer-feature.json b/src/neovim-apt-get/devcontainer-feature.json
index cf990b63e..072813be2 100644
--- a/src/neovim-apt-get/devcontainer-feature.json
+++ b/src/neovim-apt-get/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "neovim-apt-get",
-    "version": "1.0.17",
+    "version": "1.0.18",
     "name": "Neovim (via apt-get)",
     "documentationURL": "http://github.com/devcontainers-contrib/features/tree/main/src/neovim-apt-get",
     "description": "Neovim is a fork of Vim focused on modern code and features, rather than running in legacy environments.",
diff --git a/src/neovim-apt-get/install.sh b/src/neovim-apt-get/install.sh
index c82508e40..4d7a8ce19 100755
--- a/src/neovim-apt-get/install.sh
+++ b/src/neovim-apt-get/install.sh
@@ -9,14 +9,15 @@ source ./library_scripts.sh
 # `ensure_nanolayer` is a bash function that will find any existing nanolayer installations, 
 # and if missing - will download a temporary copy that automatically get deleted at the end 
 # of the script
-ensure_nanolayer nanolayer_location "v0.4.29"
+ensure_nanolayer nanolayer_location "v0.4.46"
 
 
 $nanolayer_location \
     install \
     devcontainer-feature \
-    "ghcr.io/devcontainers-contrib/features/apt-get-packages:1.0.4" \
-    --option packages='neovim' --option ppas='ppa:neovim-ppa/stable' --option force_ppas_on_non_ubuntu='true'
+    "ghcr.io/devcontainers-contrib/features/apt-get-packages:1.0.6" \
+    --option packages='neovim' --option ppas='ppa:neovim-ppa/stable'
+    
 
 
 echo 'Done!'
diff --git a/test/neovim-apt-get/scenarios.json b/test/neovim-apt-get/scenarios.json
index ba3ab96ba..90a2442b8 100644
--- a/test/neovim-apt-get/scenarios.json
+++ b/test/neovim-apt-get/scenarios.json
@@ -1,8 +1,14 @@
 {
-    "test": {
+    "test_ubuntu": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "features": {
             "neovim-apt-get": {}
         }
+    },
+    "test_debian": {
+        "image": "mcr.microsoft.com/devcontainers/base:debian",
+        "features": {
+            "neovim-apt-get": {}
+        }
     }
 }
\ No newline at end of file
diff --git a/test/neovim-apt-get/test.sh b/test/neovim-apt-get/test_debian.sh
similarity index 100%
rename from test/neovim-apt-get/test.sh
rename to test/neovim-apt-get/test_debian.sh
diff --git a/test/neovim-apt-get/test_ubuntu.sh b/test/neovim-apt-get/test_ubuntu.sh
new file mode 100755
index 000000000..e6017c640
--- /dev/null
+++ b/test/neovim-apt-get/test_ubuntu.sh
@@ -0,0 +1,9 @@
+#!/bin/bash -i
+
+set -e
+
+source dev-container-features-test-lib
+
+check "nvim --version" nvim --version
+
+reportResults