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
Ivan Tyagov
slapos.package
Commits
0733a440
Commit
0733a440
authored
Jul 31, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-build-installer: fix ISCC path
parent
43c79c47
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
windows/scripts/slapos-build-installer
windows/scripts/slapos-build-installer
+1
-1
windows/scripts/slapos-cygwin-bootstrip.sh
windows/scripts/slapos-cygwin-bootstrip.sh
+5
-2
No files found.
windows/scripts/slapos-build-installer
View file @
0733a440
...
@@ -30,7 +30,7 @@ echo ""
...
@@ -30,7 +30,7 @@ echo ""
# Constants
# Constants
# ======================================================================
# ======================================================================
declare
-r
cygwin_home
=
$(
cygpath
-a
$(
cygpath
-w
/
)
\\
.. |
sed
-e
"s%/
$%
%"
)
declare
-r
cygwin_home
=
$(
cygpath
-a
$(
cygpath
-w
/
)
\\
.. |
sed
-e
"s%/
$%
%"
)
declare
-r
ISCC
=
/inno-setup/ISCC.exe
declare
-r
ISCC
=
${
cygwin_home
}
/inno-setup/ISCC.exe
# -----------------------------------------------------------
# -----------------------------------------------------------
# Command line options
# Command line options
...
...
windows/scripts/slapos-cygwin-bootstrip.sh
View file @
0733a440
...
@@ -64,6 +64,7 @@ declare -r ipv6_local_address=2001:67c:1254:e:32::1
...
@@ -64,6 +64,7 @@ declare -r ipv6_local_address=2001:67c:1254:e:32::1
declare
-r
slapos_user_basename
=
slapboot-user
declare
-r
slapos_user_basename
=
slapboot-user
declare
-r
slapos_installer_software
=
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/slapos-windows-installer/software.cfg
declare
-r
slapos_installer_software
=
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/slapos-windows-installer/software.cfg
declare
-r
cygwin_home
=
$(
cygpath
-a
$(
cygpath
-w
/
)
\\
.. |
sed
-e
"s%/
$%
%"
)
# -----------------------------------------------------------
# -----------------------------------------------------------
# Patch cygwin packages for building slapos
# Patch cygwin packages for building slapos
...
@@ -213,9 +214,11 @@ csih_inform "Starting configure slapos client and node ..."
...
@@ -213,9 +214,11 @@ csih_inform "Starting configure slapos client and node ..."
for
_name
in
certificate key computer.key computer.crt
;
do
for
_name
in
certificate key computer.key computer.crt
;
do
[[
-f
~/
${
_name
}
]]
||
csih_error
"missing file ~/
${
_name
}
"
[[
-f
~/
${
_name
}
]]
||
csih_error
"missing file ~/
${
_name
}
"
done
done
for
_name
in
/test-computer.key /
test-computer.crt
;
do
for
_name
in
test-computer.key
test-computer.crt
;
do
[[
-f
${
_name
}
]]
||
csih_error
"missing file
${
_name
}
"
[[
-f
${
cygwin_home
}
/
${
_name
}
]]
||
csih_error
"missing file
${
cygwin_home
}
/
${
_name
}
"
done
done
cp
~/certificate
${
cygwin_home
}
&&
csih_inform
"copy ~/certificate to
${
cygwin_home
}
"
cp
~/key
${
cygwin_home
}
&&
csih_inform
"copy ~/key to
${
cygwin_home
}
"
csih_inform
"mkdir /etc/opt/slapos/ssl/partition_pki"
csih_inform
"mkdir /etc/opt/slapos/ssl/partition_pki"
mkdir
-p
/etc/opt/slapos/ssl/partition_pki
mkdir
-p
/etc/opt/slapos/ssl/partition_pki
...
...
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