Skip to content

Commit acb3721

Browse files
AkshayAwateakshay
and
akshay
authored
refactor: start_docker() (#1410)
* refactor: start_docker() Co-authored-by: akshay <[email protected]>
1 parent 475c44a commit acb3721

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

deploy/install.sh

+20-6
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,14 @@ start_docker() {
204204
echo "Starting docker service"
205205
$sudo_cmd systemctl start docker.service
206206
fi
207+
# if [[ -z $sudo_cmd ]]; then
208+
# docker ps > /dev/null && true
209+
# if [[ $? -ne 0 ]]; then
210+
# request_sudo
211+
# fi
212+
# fi
207213
if [[ -z $sudo_cmd ]]; then
208-
docker ps > /dev/null && true
209-
if [[ $? -ne 0 ]]; then
214+
if ! docker ps > /dev/null && true; then
210215
request_sudo
211216
fi
212217
fi
@@ -268,8 +273,12 @@ request_sudo() {
268273
if (( $EUID != 0 )); then
269274
sudo_cmd="sudo"
270275
echo -e "Please enter your sudo password, if prompt."
271-
$sudo_cmd -l | grep -e "NOPASSWD: ALL" > /dev/null
272-
if [[ $? -ne 0 ]] && ! $sudo_cmd -v; then
276+
# $sudo_cmd -l | grep -e "NOPASSWD: ALL" > /dev/null
277+
# if [[ $? -ne 0 ]] && ! $sudo_cmd -v; then
278+
# echo "Need sudo privileges to proceed with the installation."
279+
# exit 1;
280+
# fi
281+
if ! $sudo_cmd -l | grep -e "NOPASSWD: ALL" > /dev/null && ! $sudo_cmd -v; then
273282
echo "Need sudo privileges to proceed with the installation."
274283
exit 1;
275284
fi
@@ -303,8 +312,13 @@ echo -e "🌏 Detecting your OS ...\n"
303312
check_os
304313

305314
# Obtain unique installation id
306-
sysinfo="$(uname -a)"
307-
if [[ $? -ne 0 ]]; then
315+
# sysinfo="$(uname -a)"
316+
# if [[ $? -ne 0 ]]; then
317+
# uuid="$(uuidgen)"
318+
# uuid="${uuid:-$(cat /proc/sys/kernel/random/uuid)}"
319+
# sysinfo="${uuid:-$(cat /proc/sys/kernel/random/uuid)}"
320+
# fi
321+
if ! sysinfo="$(uname -a)"; then
308322
uuid="$(uuidgen)"
309323
uuid="${uuid:-$(cat /proc/sys/kernel/random/uuid)}"
310324
sysinfo="${uuid:-$(cat /proc/sys/kernel/random/uuid)}"

0 commit comments

Comments
 (0)