Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kasra Jamshidi
slapos.package
Commits
033685a5
Commit
033685a5
authored
Sep 13, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-configure: fix slapos_wget_file duplicated -O parameter
parent
1a645938
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
windows/scripts/slapos-configure.sh
windows/scripts/slapos-configure.sh
+3
-3
No files found.
windows/scripts/slapos-configure.sh
View file @
033685a5
...
@@ -391,7 +391,7 @@ function configure_section_openvpn()
...
@@ -391,7 +391,7 @@ function configure_section_openvpn()
check_os_is_wow64
&&
_arch
=
x64
check_os_is_wow64
&&
_arch
=
x64
if
[[
!
-x
/usr/bin/openvpn.exe
]]
;
then
if
[[
!
-x
/usr/bin/openvpn.exe
]]
;
then
[[
!
-x
/opt/openvpn/bin/openvpn.exe
]]
&&
[[
!
-x
/opt/openvpn/bin/openvpn.exe
]]
&&
slapos_wget_file http://dashingsoft.com/products/openvpn-
${
_arch
}
.tar.gz
-O
~/openvpn.tar.gz
&&
slapos_wget_file http://dashingsoft.com/products/openvpn-
${
_arch
}
.tar.gz ~/openvpn.tar.gz
&&
(
cd
/opt
;
tar
--no-same-owner
xzf ~/openvpn.tar.gz
)
(
cd
/opt
;
tar
--no-same-owner
xzf ~/openvpn.tar.gz
)
for
name
in
openvpn.exe devcon.exe
\
for
name
in
openvpn.exe devcon.exe
\
...
@@ -406,7 +406,7 @@ function configure_section_openvpn()
...
@@ -406,7 +406,7 @@ function configure_section_openvpn()
if
[[
!
-f
${
_path
}
/OemWin2k.inf
]]
;
then
if
[[
!
-f
${
_path
}
/OemWin2k.inf
]]
;
then
mkdir
-p
${
_path
}
mkdir
-p
${
_path
}
[[
!
-f
/opt/openvpn/driver/OemWin2k.inf
]]
&&
[[
!
-f
/opt/openvpn/driver/OemWin2k.inf
]]
&&
slapos_wget_file http://dashingsoft.com/products/openvpn-
${
_arch
}
.tar.gz
-O
~/openvpn.tar.gz
&&
slapos_wget_file http://dashingsoft.com/products/openvpn-
${
_arch
}
.tar.gz ~/openvpn.tar.gz
&&
(
cd
/opt
;
tar
--no-same-owner
xzf ~/openvpn.tar.gz
)
(
cd
/opt
;
tar
--no-same-owner
xzf ~/openvpn.tar.gz
)
for
name
in
OemWin2k.inf tap0901.cat tap0901.sys
;
do
for
name
in
OemWin2k.inf tap0901.cat tap0901.sys
;
do
...
@@ -420,7 +420,7 @@ function configure_section_openvpn()
...
@@ -420,7 +420,7 @@ function configure_section_openvpn()
for
name
in
ovpn-client ovpn-server
;
do
for
name
in
ovpn-client ovpn-server
;
do
[[
-x
${
_path
}
/
${
name
}
.exe
]]
&&
continue
[[
-x
${
_path
}
/
${
name
}
.exe
]]
&&
continue
[[
!
-f
/opt/openvpn/re6st/
${
name
}
.exe
]]
&&
[[
!
-f
/opt/openvpn/re6st/
${
name
}
.exe
]]
&&
slapos_wget_file http://dashingsoft.com/products/openvpn-
${
_arch
}
.tar.gz
-O
~/openvpn.tar.gz
&&
slapos_wget_file http://dashingsoft.com/products/openvpn-
${
_arch
}
.tar.gz ~/openvpn.tar.gz
&&
(
cd
/opt
;
tar
--no-same-owner
xzf ~/openvpn.tar.gz
)
(
cd
/opt
;
tar
--no-same-owner
xzf ~/openvpn.tar.gz
)
csih_inform
"copy /opt/openvpn/re6st/
${
name
}
.exe to
${
_path
}
"
csih_inform
"copy /opt/openvpn/re6st/
${
name
}
.exe to
${
_path
}
"
...
...
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