Drop qrencode dependency from installers
This commit is contained in:
parent
6c95ef07a9
commit
a76035cbff
|
|
@ -246,13 +246,6 @@ function Install-ViaChocolatey {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Install qrencode
|
|
||||||
if (-not (Test-Command qrencode)) {
|
|
||||||
Write-Host "Installing qrencode..." -ForegroundColor Yellow
|
|
||||||
choco install -y qrencode
|
|
||||||
} else {
|
|
||||||
Write-Host "[OK] qrencode already installed" -ForegroundColor Green
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Host "[OK] Chocolatey installation complete" -ForegroundColor Green
|
Write-Host "[OK] Chocolatey installation complete" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
@ -313,13 +306,6 @@ function Install-ViaScoop {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Install qrencode
|
|
||||||
if (-not (Test-Command qrencode)) {
|
|
||||||
Write-Host "Installing qrencode..." -ForegroundColor Yellow
|
|
||||||
scoop install qrencode
|
|
||||||
} else {
|
|
||||||
Write-Host "[OK] qrencode already installed" -ForegroundColor Green
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Host "[OK] Scoop installation complete" -ForegroundColor Green
|
Write-Host "[OK] Scoop installation complete" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
@ -404,12 +390,6 @@ if (Test-Command ffmpeg) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Test-Command qrencode) {
|
|
||||||
Write-Host "[OK] qrencode: found" -ForegroundColor Green
|
|
||||||
} else {
|
|
||||||
Write-Host "[ERROR] qrencode not found in PATH" -ForegroundColor Red
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Test-Command dvdauthor) {
|
if (Test-Command dvdauthor) {
|
||||||
Write-Host "[OK] dvdauthor: found" -ForegroundColor Green
|
Write-Host "[OK] dvdauthor: found" -ForegroundColor Green
|
||||||
|
|
|
||||||
|
|
@ -171,9 +171,6 @@ else
|
||||||
if ! command -v ffmpeg &> /dev/null; then
|
if ! command -v ffmpeg &> /dev/null; then
|
||||||
missing_deps+=("ffmpeg")
|
missing_deps+=("ffmpeg")
|
||||||
fi
|
fi
|
||||||
if ! command -v qrencode &> /dev/null; then
|
|
||||||
missing_deps+=("qrencode")
|
|
||||||
fi
|
|
||||||
if [ -z "$SKIP_DVD_TOOLS" ]; then
|
if [ -z "$SKIP_DVD_TOOLS" ]; then
|
||||||
# Check if DVD tools are already installed
|
# Check if DVD tools are already installed
|
||||||
if command -v dvdauthor &> /dev/null && command -v xorriso &> /dev/null; then
|
if command -v dvdauthor &> /dev/null && command -v xorriso &> /dev/null; then
|
||||||
|
|
@ -255,33 +252,33 @@ else
|
||||||
if command -v apt-get &> /dev/null; then
|
if command -v apt-get &> /dev/null; then
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
||||||
sudo apt-get install -y ffmpeg qrencode
|
sudo apt-get install -y ffmpeg
|
||||||
else
|
else
|
||||||
sudo apt-get install -y ffmpeg dvdauthor xorriso qrencode
|
sudo apt-get install -y ffmpeg dvdauthor xorriso
|
||||||
fi
|
fi
|
||||||
elif command -v dnf &> /dev/null; then
|
elif command -v dnf &> /dev/null; then
|
||||||
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
||||||
sudo dnf install -y ffmpeg qrencode
|
sudo dnf install -y ffmpeg
|
||||||
else
|
else
|
||||||
sudo dnf install -y ffmpeg dvdauthor xorriso qrencode
|
sudo dnf install -y ffmpeg dvdauthor xorriso
|
||||||
fi
|
fi
|
||||||
elif command -v pacman &> /dev/null; then
|
elif command -v pacman &> /dev/null; then
|
||||||
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
||||||
sudo pacman -Sy --noconfirm ffmpeg qrencode
|
sudo pacman -Sy --noconfirm ffmpeg
|
||||||
else
|
else
|
||||||
sudo pacman -Sy --noconfirm ffmpeg dvdauthor cdrtools qrencode
|
sudo pacman -Sy --noconfirm ffmpeg dvdauthor cdrtools
|
||||||
fi
|
fi
|
||||||
elif command -v zypper &> /dev/null; then
|
elif command -v zypper &> /dev/null; then
|
||||||
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
||||||
sudo zypper install -y ffmpeg qrencode
|
sudo zypper install -y ffmpeg
|
||||||
else
|
else
|
||||||
sudo zypper install -y ffmpeg dvdauthor xorriso qrencode
|
sudo zypper install -y ffmpeg dvdauthor xorriso
|
||||||
fi
|
fi
|
||||||
elif command -v brew &> /dev/null; then
|
elif command -v brew &> /dev/null; then
|
||||||
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
||||||
brew install ffmpeg qrencode
|
brew install ffmpeg
|
||||||
else
|
else
|
||||||
brew install ffmpeg dvdauthor xorriso qrencode
|
brew install ffmpeg dvdauthor xorriso
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo -e "${RED}[ERROR] No supported package manager found.${NC}"
|
echo -e "${RED}[ERROR] No supported package manager found.${NC}"
|
||||||
|
|
@ -369,11 +366,6 @@ else
|
||||||
echo "Please install: ffmpeg"
|
echo "Please install: ffmpeg"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if ! command -v qrencode &> /dev/null; then
|
|
||||||
echo -e "${RED}[ERROR] Missing required dependencies after install attempt.${NC}"
|
|
||||||
echo "Please install: qrencode"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [ "$SKIP_DVD_TOOLS" = false ]; then
|
if [ "$SKIP_DVD_TOOLS" = false ]; then
|
||||||
if ! command -v dvdauthor &> /dev/null; then
|
if ! command -v dvdauthor &> /dev/null; then
|
||||||
echo -e "${RED}[ERROR] Missing required dependencies after install attempt.${NC}"
|
echo -e "${RED}[ERROR] Missing required dependencies after install attempt.${NC}"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user