2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Replaced 'which' with 'command -v'

Browse source 
* Allows use under new Arch base package
This commit is contained in:
2Shirt 2020-01-13 20:11:25 -07:00
parent 6408b1abff
commit 0e602bb504
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
setup/build_linux
View file

@ -19,9 +19,9 @@ REPO_DIR="$BUILD_DIR/repo"
SKEL_DIR="$LIVE_DIR/airootfs/etc/skel" SKEL_DIR="$LIVE_DIR/airootfs/etc/skel"
TEMP_DIR="$BUILD_DIR/temp" TEMP_DIR="$BUILD_DIR/temp"
MIRRORLIST_SOURCE='https://www.archlinux.org/mirrorlist/?country=US&protocol=http&protocol=https&ip_version=4&use_mirror_status=on' MIRRORLIST_SOURCE='https://www.archlinux.org/mirrorlist/?country=US&protocol=http&protocol=https&ip_version=4&use_mirror_status=on'
if which nano >/dev/null 2>&1; then if command -v nano >/dev/null 2>&1; then
EDITOR=nano EDITOR=nano
elif which vim >/dev/null 2>&1; then elif command -v vim >/dev/null 2>&1; then
EDITOR=vim EDITOR=vim
else else
EDITOR=vi EDITOR=vi
@ -130,7 +130,7 @@ function copy_live_env() {
function run_elevated() { function run_elevated() {
prog="$1" prog="$1"
shift shift
if which sudo >/dev/null 2>&1; then if command -v sudo >/dev/null 2>&1; then
if ! sudo "$prog" $*; then if ! sudo "$prog" $*; then
echo "ERROR: Failed to run '$prog'" echo "ERROR: Failed to run '$prog'"
if ask "Retry?"; then if ask "Retry?"; then