|
@@ -27,12 +27,22 @@ elif [[ ${DOCKER_COMMAND} != "docker" && ${DOCKER_COMMAND} != "podman" ]]; then
|
|
fi
|
|
fi
|
|
|
|
|
|
docker="${DOCKER_COMMAND}"
|
|
docker="${DOCKER_COMMAND}"
|
|
-dockerCompose="${DOCKER_COMMAND}-compose"
|
|
|
|
|
|
+${docker} --version > /dev/null 2>&1
|
|
|
|
+dockerInstalled=$?
|
|
|
|
+
|
|
|
|
+dockerCompose="${docker} compose"
|
|
|
|
+${dockerCompose} version > /dev/null 2>&1
|
|
|
|
+composeInstalled=$?
|
|
|
|
+if [[ ${composeInstalled} -gt 0 ]]; then
|
|
|
|
+ dockerCompose="${docker}-compose"
|
|
|
|
+ ${dockerCompose} --version > /dev/null 2>&1
|
|
|
|
+ composeInstalled=$?
|
|
|
|
+fi
|
|
|
|
|
|
-if [[ ! -x "$(command -v ${docker})" || ! -x "$(command -v ${dockerCompose})" ]]; then
|
|
|
|
- if [[ -x "$(command -v ${docker})" && ! -x "$(command -v ${dockerCompose})" ]]; then
|
|
|
|
|
|
+if [[ ${dockerInstalled} -gt 0 || ${composeInstalled} -gt 0 ]]; then
|
|
|
|
+ if [[ ${dockerInstalled} -eq 0 && ${composeInstalled} -gt 0 ]]; then
|
|
echo -e "${RED}Error: ${dockerCompose} not installed.${NC}"
|
|
echo -e "${RED}Error: ${dockerCompose} not installed.${NC}"
|
|
- elif [[ ! -x "$(command -v ${docker})" && -x "$(command -v ${dockerCompose})" ]]; then
|
|
|
|
|
|
+ elif [[ ${dockerInstalled} -gt 0 && ${composeInstalled} -eq 0 ]]; then
|
|
echo -e "${RED}Error: ${docker} not installed.${NC}"
|
|
echo -e "${RED}Error: ${docker} not installed.${NC}"
|
|
else
|
|
else
|
|
echo -e "${RED}Error: ${docker} and ${dockerCompose} not installed.${NC}"
|
|
echo -e "${RED}Error: ${docker} and ${dockerCompose} not installed.${NC}"
|
|
@@ -51,7 +61,7 @@ dockerCompose="${dockerCompose} ${composeFiles}"
|
|
|
|
|
|
handleServices()
|
|
handleServices()
|
|
{
|
|
{
|
|
- validServices=($1)
|
|
|
|
|
|
+ IFS=" " read -r -a validServices <<< "${1}"
|
|
servicesArray=()
|
|
servicesArray=()
|
|
invalidServices=false
|
|
invalidServices=false
|
|
for x in "${@:2}"; do
|
|
for x in "${@:2}"; do
|
|
@@ -273,12 +283,14 @@ case $1 in
|
|
|
|
|
|
lint|eslint)
|
|
lint|eslint)
|
|
echo -e "${CYAN}Musare | Lint${NC}"
|
|
echo -e "${CYAN}Musare | Lint${NC}"
|
|
|
|
+ # shellcheck disable=SC2001
|
|
services=$(sed "s/\(\ \)\{0,1\}\(-\)\{0,2\}fix//g;t;q1" <<< "${@:2}")
|
|
services=$(sed "s/\(\ \)\{0,1\}\(-\)\{0,2\}fix//g;t;q1" <<< "${@:2}")
|
|
fixFound=$?
|
|
fixFound=$?
|
|
if [[ $fixFound -eq 0 ]]; then
|
|
if [[ $fixFound -eq 0 ]]; then
|
|
fix="--fix"
|
|
fix="--fix"
|
|
echo -e "${GREEN}Auto-fix enabled${NC}"
|
|
echo -e "${GREEN}Auto-fix enabled${NC}"
|
|
fi
|
|
fi
|
|
|
|
+ # shellcheck disable=SC2001
|
|
services=$(sed "s/\(\ \)\{0,1\}\(-\)\{0,2\}no-cache//g;t;q1" <<< "${services}")
|
|
services=$(sed "s/\(\ \)\{0,1\}\(-\)\{0,2\}no-cache//g;t;q1" <<< "${services}")
|
|
noCacheFound=$?
|
|
noCacheFound=$?
|
|
cache="--cache"
|
|
cache="--cache"
|
|
@@ -291,12 +303,12 @@ case $1 in
|
|
if [[ ${servicesString:0:1} == 1 ]]; then
|
|
if [[ ${servicesString:0:1} == 1 ]]; then
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *frontend* ]]; then
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *frontend* ]]; then
|
|
echo -e "${CYAN}Running frontend lint...${NC}"
|
|
echo -e "${CYAN}Running frontend lint...${NC}"
|
|
- ${dockerCompose} exec -T frontend npx eslint $cache src --ext .js,.ts,.vue $fix
|
|
|
|
|
|
+ ${dockerCompose} exec -T frontend npx eslint "${cache}" src --ext .js,.ts,.vue "${fix}"
|
|
frontendExitValue=$?
|
|
frontendExitValue=$?
|
|
fi
|
|
fi
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *backend* ]]; then
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *backend* ]]; then
|
|
echo -e "${CYAN}Running backend lint...${NC}"
|
|
echo -e "${CYAN}Running backend lint...${NC}"
|
|
- ${dockerCompose} exec -T backend npx eslint $cache logic $fix
|
|
|
|
|
|
+ ${dockerCompose} exec -T backend npx eslint "${cache}" logic "${fix}"
|
|
backendExitValue=$?
|
|
backendExitValue=$?
|
|
fi
|
|
fi
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *docs* ]]; then
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *docs* ]]; then
|