Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Applications
manjaro-architect
Commits
e04f4498
Commit
e04f4498
authored
Apr 06, 2017
by
Bernhard Landauer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "use nw_check.py"
This reverts commit
a638febb
.
parent
088b8aa4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
35 deletions
+5
-35
Makefile
Makefile
+2
-3
bin/nw_check.in
bin/nw_check.in
+0
-29
bin/setup
bin/setup
+1
-1
lib/util.sh
lib/util.sh
+2
-2
No files found.
Makefile
View file @
e04f4498
...
...
@@ -6,10 +6,9 @@ DATADIR = /share/manjaro-architect
BIN
=
\
bin/btrfs-subvol-functions
\
bin/check-translate
\
bin/check-translate
.in
\
bin/ma-launcher
\
bin/manjaro-architect
\
bin/nw_check
bin/manjaro-architect
LIBS
=
\
lib/ini_val.sh
\
...
...
bin/nw_check.in
deleted
100644 → 0
View file @
088b8aa4
#!/usr/bin/env python3
#
# Architect Installation Framework (2016-2017)
#
# Written by Carl Duff and @mandog for Archlinux
# Heavily modified and re-written by @Chrysostomus to install Manjaro instead
# Contributors: @papajoker, @oberon, and the Manjaro-Community.
#
# This program is free software, provided under the GNU General Public License
# as published by the Free Software Foundation. So feel free to copy, distribute,
# or modify it as you wish.
"""connectivity check, kindly contributed by @fhdk"""
import
sys
from
urllib.request
import
urlopen
remote_host
=
"https://manjaro.org"
maxwait
=
2
data
=
None
try
:
data
=
urlopen
(
remote_host
,
timeout
=
maxwait
)
except
:
pass
if
data
:
sys
.
exit
(
0
)
else
:
sys
.
exit
(
1
)
bin/setup
View file @
e04f4498
...
...
@@ -12,7 +12,7 @@
[[ -e /run/miso/bootmnt ]] && setfont ter-116n
while
! nw_check
; do
while
[[ ! $(ping -c 2 manjaro.org) ]]
; do
if [[ $(cat /proc/1/comm) == "systemd" ]];then
if [[ $(systemctl is-active NetworkManager) == "active" ]]; then
dialog --backtitle ":: Manjaro Architect ::" --yesno "\nPlease connect to the internet:\n" 0 0 && \
...
...
lib/util.sh
View file @
e04f4498
...
...
@@ -341,7 +341,7 @@ set_keymap() {
}
mk_connection
()
{
if
!
nw_check
;
then
if
[[
!
$(
ping
-c
2 google.com
)
]]
;
then
DIALOG
"
$_NoCon
"
--yesno
"
\n
$_EstCon
\n
"
0 0
&&
$NW_CMD
&&
return
0
||
clear
&&
exit
0
fi
}
...
...
@@ -358,7 +358,7 @@ check_requirements() {
exit
1
fi
if
!
nw_check
;
then
if
[[
!
$(
ping
-c
1 google.com
)
]]
;
then
DIALOG
"
$_ErrTitle
"
--infobox
"
\n
$_ConFailBody
\n
"
0 0
sleep
2
exit
1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment