Commit 32529283 authored by Rafael S Castilho's avatar Rafael S Castilho
Browse files

SCRUM#615: fixed merge conflicts


Signed-off-by: Rafael S Castilho's avatarRafael S Castilho <rsc15@inf.ufpr.br>
parent 72915bbe
Pipeline #17815 passed with stages
in 3 minutes and 42 seconds
......@@ -23,7 +23,7 @@
# shellcheck disable=SC2181
# shellcheck disable=SC1117
TEXT="\"quero digitar o INEP da minha escola depois\""
# TEXT="\"quero digitar o INEP da minha escola depois\""
SEED_HOME="/opt/seed_mec/SEED2"
F_INEP="${SEED_HOME}/client/conf/inep"
MD5F_INEP="${SEED_HOME}/.md5sum/client/conf/inep"
......@@ -120,11 +120,7 @@ function verify_proxy() {
zenity --question --title="INEP" --cancel-label="Não" --ok-label="Sim" \
--text="Host:$host \nPorta: $port \nUsuario: $user \nEssas informações estão corretas?"
if [[ $? -eq 0 ]]; then
echo "phost=""$host" > $F_PROXY
echo "pport=""$port" >> $F_PROXY
echo "puid=""$user" >> $F_PROXY
echo "ppasswd=""$password" >> $F_PROXY
echo {"phost=$host","pport=$port","puid=$user","ppasswd=$password"} > "$F_PROXY"
proxy_ok="true"
fi
fi
......
......@@ -74,7 +74,7 @@ function disable_gnome() {
while true; do
# Get PID
P_EDUBAR_POS="$(ps aux | grep "le-edubar_position.sh" | grep -v "grep" \
P_EDUBAR_POS="$(pgrep "le-edubar_position.sh" | grep -v "grep" \
| awk '{print $2}')"
P_GPANEL=$(pgrep gnome-panel)
P_EDUBAR=$(pgrep -f "le-edubar -c")
......@@ -89,19 +89,21 @@ function disable_gnome() {
done
# Disable Edubar and Panel
kill -stop $P_EDUBAR_POS $P_GPANEL
kill -stop "$P_EDUBAR_POS" "$P_GPANEL"
kill "$P_EDUBAR"
}
# Enable user interaction with gnome panel
function enable_gnome() {
# Get PID
local P_EDUBAR_POS=$(ps aux | grep "le-edubar_position.sh" | awk '{print $2}')
local P_GPANEL=$(pgrep gnome-panel)
local P_EDUBAR_POS
P_EDUBAR_POS=$(pgrep "le-edubar_position.sh" | awk '{print $2}')
local P_GPANEL
P_GPANEL=$(pgrep gnome-panel)
# Enable Edubar and Panel
# NOTE: le-edubar_position.sh will automatically open le-edubar
kill -cont $P_GPANEL $P_EDUBAR_POS
kill -cont "$P_GPANEL" "$P_EDUBAR_POS"
}
function call_dialog_inep_mult_on () {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment