Merge pull request #107 from microsoft/copilot/change-os-detection-to-package-manager

Replace OS detection with package manager detection in install scripts

Author: markphip

src/artifacts-helper/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
     "name": "Azure Artifacts Credential Helper",
     "id": "artifacts-helper",
-    "version": "3.0.5",
+    "version": "3.0.6",
     "description": "Configures Codespace to authenticate with Azure Artifact feeds",
     "options": {
         "nugetURIPrefixes": {

src/artifacts-helper/install.sh

@@ -44,9 +44,6 @@ if [ "${ALIAS_AZ}" = "true" ]; then
     ALIASES_ARR+=('az')
 fi
 
-# Source /etc/os-release to get OS info
-. /etc/os-release
-
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
@@ -70,7 +67,7 @@ check_packages() {
 
 export DEBIAN_FRONTEND=noninteractive
 
-if [ "${ID}" = "mariner" ]; then
+if command -v tdnf >/dev/null 2>&1; then
     tdnf install -y wget ca-certificates
     tdnf clean all
 else

src/devtool/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
     "name": "DevTool",
     "id": "devtool",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "description": "Install DevTool",
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"

src/devtool/install.sh

@@ -3,9 +3,6 @@
 set -e
 
 
-# Source /etc/os-release to get OS info
-. /etc/os-release
-
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
@@ -30,7 +27,7 @@ check_packages() {
 
 export DEBIAN_FRONTEND=noninteractive
 
-if [ "${ID}" = "mariner" ]; then
+if command -v tdnf >/dev/null 2>&1; then
     tdnf install -y curl ca-certificates tar
     tdnf clean all
 else

src/go/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",

src/go/install.sh

@@ -19,8 +19,6 @@ INSTALL_GO_TOOLS="${INSTALL_GO_TOOLS:-"true"}"
 GO_GPG_KEY_URI="https://dl.google.com/linux/linux_signing_key.pub"
 
 set -e
-# Source /etc/os-release to get OS info
-. /etc/os-release
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -116,7 +114,7 @@ check_packages() {
 
 export DEBIAN_FRONTEND=noninteractive
 
-if [ "${ID}" = "mariner" ]; then
+if command -v tdnf >/dev/null 2>&1; then
     tdnf install -y curl ca-certificates gnupg2 tar g++ gcc make git build-essential
 else
     # Clean up
@@ -252,7 +250,7 @@ find "${TARGET_GOROOT}" -type d -print0 | xargs -n 1 -0 chmod g+s
 find "${TARGET_GOPATH}" -type d -print0 | xargs -n 1 -0 chmod g+s
 
 # Clean up
-if [ "${ID}" = "mariner" ]; then
+if command -v tdnf >/dev/null 2>&1; then
     tdnf clean all
 else
     rm -rf /var/lib/apt/lists/*

src/microsoft-git/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
     "name": "Microsoft Git for monorepo with GVFS support",
     "id": "microsoft-git",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "description": "A fork of Git containing Microsoft-specific patches",
     "options": {
         "version": {

src/microsoft-git/install.sh

@@ -9,9 +9,6 @@ GIT_VERSION=${VERSION:-"latest"}
 
 set -e
 
-# Source /etc/os-release to get OS info
-. /etc/os-release
-
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
@@ -35,7 +32,7 @@ check_packages() {
 
 export DEBIAN_FRONTEND=noninteractive
 
-if [ "${ID}" = "mariner" ]; then
+if command -v tdnf >/dev/null 2>&1; then
     tdnf install -y curl ca-certificates
 else
     check_packages curl ca-certificates
@@ -67,8 +64,7 @@ fi
 
 echo "Downloading Microsoft Git ${GIT_VERSION}..."
 
-# If ID is mariner
-if [ "${ID}" = "mariner" ]; then
+if command -v tdnf >/dev/null 2>&1; then
     # We need to build Git from source release on Mariner
     tdnf install -y wget tar git pcre2 binutils build-essential openssl-devel expat-devel curl-devel python3-devel gettext asciidoc xmlto cronie
     wget -q https://github.com/microsoft/git/archive/refs/tags/v${GIT_VERSION}.tar.gz