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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Douglas
slapos.package
Commits
005becea
Commit
005becea
authored
Jul 10, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refine slapos configure scripts.
parent
5826156b
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
186 additions
and
133 deletions
+186
-133
windows/scripts/build-slapos.sh
windows/scripts/build-slapos.sh
+36
-20
windows/scripts/post-install.sh
windows/scripts/post-install.sh
+61
-42
windows/scripts/pre-uninstall.sh
windows/scripts/pre-uninstall.sh
+21
-17
windows/scripts/slapos-all-in-one.iss
windows/scripts/slapos-all-in-one.iss
+3
-3
windows/scripts/slapos-configure.sh
windows/scripts/slapos-configure.sh
+53
-46
windows/scripts/slapos-include.sh
windows/scripts/slapos-include.sh
+3
-2
windows/scripts/slapos-node.sh
windows/scripts/slapos-node.sh
+6
-0
windows/scripts/slapos.iss
windows/scripts/slapos.iss
+3
-3
No files found.
windows/scripts/build-slapos.sh
View file @
005becea
#! /bin/bash
#! /bin/bash
export
PATH
=
/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin:
$PATH
export
PATH
=
/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin:
$PATH
function
show_error_exit
()
{
echo
Error:
${
1
-Error
:
build slapos failed.
}
read
-n
1
-p
"Press any key to exit..."
exit
1
}
slapos_home
=
${
1
-/opt/slapos
}
slapos_home
=
${
1
-/opt/slapos
}
slapos_cache
=
/opt/download-cache
slapos_cache
=
/opt/download-cache
slapos_url
=
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-0:/component/slapos/buildout.cfg
slapos_url
=
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-0:/component/slapos/buildout.cfg
...
@@ -11,8 +18,9 @@ patch_files=/etc/slapos/patches/slapos-core-format.patch
...
@@ -11,8 +18,9 @@ patch_files=/etc/slapos/patches/slapos-core-format.patch
mkdir
-p
$slapos_home
/log
mkdir
-p
$slapos_home
/log
mkdir
-p
$slapos_cache
mkdir
-p
$slapos_cache
echo
"Checking
$slapos_cfg
..."
if
[[
-r
$slapos_cfg
]]
;
then
if
[[
-r
$slapos_cfg
]]
;
then
echo
"Change
$slapos_
home
/buildout.cfg with
"
echo
"Change
$slapos_
cfg
:
"
echo
" extends =
${
slapos_url
}
"
echo
" extends =
${
slapos_url
}
"
sed
-i
-e
"s%^extends = .*
$%
extends =
${
slapos_url
}
%g"
$slapos_cfg
sed
-i
-e
"s%^extends = .*
$%
extends =
${
slapos_url
}
%g"
$slapos_cfg
else
else
...
@@ -22,36 +30,44 @@ extends = ${slapos_url}
...
@@ -22,36 +30,44 @@ extends = ${slapos_url}
download-cache =
${
slapos_cache
}
download-cache =
${
slapos_cache
}
prefix =
$$
{buildout:directory}
prefix =
$$
{buildout:directory}
EOF
EOF
echo
"
$slapos_home
/buildout.cfg cre
ated."
echo
"
File
$slapos_cfg
has been gener
ated."
fi
fi
echo
"Checking
$slapos_bootstrap
..."
if
[[
!
-f
$slapos_bootstrap
]]
;
then
if
[[
!
-f
$slapos_bootstrap
]]
;
then
python
-S
-c
'import urllib2;print urllib2.urlopen("http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/bootstrap.py").read()'
>
$slapos_bootstrap
echo
"Downloading
$slapos_bootstrap
..."
echo
"
$slapos_bootstrap
downloaded."
python
-S
-c
'import urllib2;print urllib2.urlopen("http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/bootstrap.py").read()'
>
$slapos_bootstrap
||
if
(!
cd
$slapos_home
;
python
-S
bootstrap.py
)
;
then
show_error_exit
"Error: download
$slapos_bootstrap
"
echo
"SlapOS bootstrap failed
."
echo
"Downlaod
$slapos_bootstrap
OK
."
exit
1
else
fi
echo
OK.
fi
fi
# cd $slapos_home
if
[[
!
-x
$slapos_home
/run/buildout
]]
;
then
if
(!
cd
$slapos_home
;
$slapos_home
/bin/buildout
-v
-N
)
;
then
echo
"Bootstrap slapos ..."
echo
"SlapOS buildout
failed."
(
cd
$slapos_home
;
python
-S
bootstrap.py
)
||
show_error_exit
"Error: slapos bootstrap
failed."
e
xit
1
e
cho
"Bootstrap slapos OK."
fi
fi
echo
echo
Start buildout of slapos ...
echo
(
cd
$slapos_home
;
$slapos_home
/bin/buildout
-v
-N
)
||
show_error_exit
"Error slapos buildout failed."
# apply patches
# apply patches
for
filename
in
$patch_files
;
do
for
_
filename
in
$patch_files
;
do
if
[[
-r
$
filename
]]
;
then
if
[[
-r
$
{
_filename
}
]]
;
then
echo
"Apply patch:
$
filename
"
echo
"Apply patch:
$
{
_filename
}
"
for
x
in
$(
find
$slapos_home
/eggs
-name
slapos.core-
*
.egg
)
;
do
for
_path
in
$(
find
$slapos_home
/eggs
-name
slapos.core-
*
.egg
)
;
do
echo
" at
$
x
..."
echo
" at
$
{
_path
}
..."
(
cd
$
x
;
patch
-f
--dry-run
-p1
<
$filename
>
/dev/null
&&
\
(
cd
$
{
_path
}
;
patch
-f
--dry-run
-p1
<
${
_filename
}
>
/dev/null
&&
patch
-p1
<
$
filename
&&
echo
"
OK."
)
patch
-p1
<
$
{
_filename
}
&&
echo
"
OK."
)
done
done
fi
fi
done
done
echo
Build SlapOS successfully.
echo
echo
Build slapos node successfully.
echo
read
-n
1
-t
60
-p
"Press any key to exit..."
read
-n
1
-t
60
-p
"Press any key to exit..."
exit
0
exit
0
windows/scripts/post-install.sh
View file @
005becea
...
@@ -16,28 +16,26 @@
...
@@ -16,28 +16,26 @@
#
#
function
show_error_exit
()
function
show_error_exit
()
{
{
echo
Error:
$
1
echo
Error:
$
{
1
-Run post-install script failed.
}
read
-n
1
-p
"Press any key to exit..."
read
-n
1
-p
"Press any key to exit..."
exit
1
exit
1
}
}
password_filename
=
/etc/passwd
password_filename
=
/etc/passwd
echo
Checking
passwd file
...
echo
Checking
/etc/passwd
...
if
[[
!
-f
$password_filename
]]
;
then
if
[[
!
-f
$password_filename
]]
;
then
echo
No passwd file found.
mkpasswd
-l
>
$password_filename
||
show_error_exit
"Error: mkpasswd failed"
mkpasswd
-l
>
$password_filename
||
show_error_exit
"mkpasswd failed"
echo
File /etc/passwd has been generated.
echo
Generate passwd file OK.
else
else
echo
Check passwd file
OK.
echo
OK.
fi
fi
echo
Checking
group file
...
echo
Checking
/etc/group
...
if
[[
!
-f
/etc/group
]]
;
then
if
[[
!
-f
/etc/group
]]
;
then
echo
No group file found.
mkgroup
-l
>
/etc/group
||
show_error_exit
"Error: mkgroup failed"
mkgroup
-l
>
/etc/group
||
show_error_exit
"mkgroup failed"
echo
File /etc/group has been generated.
echo
Generate group file OK.
else
else
echo
Check group file
OK.
echo
OK.
fi
fi
# grep -q "^root:" $password_filename
# grep -q "^root:" $password_filename
...
@@ -51,25 +49,32 @@ fi
...
@@ -51,25 +49,32 @@ fi
# fi
# fi
# fi
# fi
DEFAULT_SYSTEM_CHARSET
=
$(
ipwin codepage
)
||
echo
Checking Windows OEM Codepage ...
DEFAULT_SYSTEM_CHARSET
=
""
_charset
=
$(
ipwin codepage
)
||
_charset
=
""
if
[[
!
-f
~/.minttyrc
]]
;
then
echo
Windows OEM Codepage is
${
_charset
}
echo
Creating ~/.minttyrc
cat
<<
EOF
> ~/.minttyrc
_filename
=
"~/.minttyrc"
echo
Checking
${
_filename
}
...
if
[[
!
-f
${
_filename
}
]]
;
then
echo
Creating
${
_filename
}
cat
<<
EOF
>
${
_filename
}
BoldAsFont=no
BoldAsFont=no
Font=Courier New
Font=Courier New
FontHeight=16
FontHeight=16
Scrollbar=none
Scrollbar=none
Locale=C
Locale=C
Charset=
${
DEFAULT_SYSTEM_CHARSET
}
Charset=
${
_charset
}
EOF
EOF
echo
File ~/.minttyrc created
echo
File
${
_filename
}
has been generated.
else
echo
OK.
fi
fi
if
[[
!
-f
/cygtty.bat
]]
;
then
_filename
=
"/cygtty.bat"
echo
Creating /cygtty.bat
echo
Checking
${
_filename
}
...
if
[[
!
-x
${
_filename
}
]]
;
then
cyghome
=
$(
cygpath
-w
/
)
cyghome
=
$(
cygpath
-w
/
)
cat
<<
EOF
>
/cygtty.bat
cat
<<
EOF
>
${
_filename
}
@echo off
@echo off
${
cyghome
:0:2
}
${
cyghome
:0:2
}
...
@@ -77,13 +82,15 @@ chdir ${cyghome}\\bin
...
@@ -77,13 +82,15 @@ chdir ${cyghome}\\bin
start mintty.exe -i /Cygwin-Terminal.ico -
start mintty.exe -i /Cygwin-Terminal.ico -
EOF
EOF
chmod
+x /cygtty.bat
chmod
+x
${
_filename
}
echo
File /cygtty.bat created.
echo
File
${
_filename
}
has been generated.
else
echo
OK.
fi
fi
# Copy rebaseall.bat to /
_filename
=
"/autorebase.bat"
if
[[
!
-f
/autorebase.bat
]]
;
then
echo
Checking
${
_filename
}
...
echo
Create /autorebase.bat
if
[[
!
-f
${
_filename
}
]]
;
then
cat
<<
EOF
> /autorebase.bat
cat
<<
EOF
> /autorebase.bat
@echo off
@echo off
rem Postinstall scripts are always started from the Cygwin root dir
rem Postinstall scripts are always started from the Cygwin root dir
...
@@ -91,37 +98,49 @@ rem so we can just call dash from here
...
@@ -91,37 +98,49 @@ rem so we can just call dash from here
path .
\b
in;%path%
path .
\b
in;%path%
dash /bin/rebaseall -p
dash /bin/rebaseall -p
EOF
EOF
chmod
+x /autorebase.bat
chmod
+x
${
_filename
}
echo
/autorebase.bat created.
echo
File
${
_filename
}
has been generated.
else
echo
OK.
fi
fi
# Change format of readme.txt
# Change format of readme.txt
readme_filepath
=
$(
cygpath
-m
/
)
/..
_filename
=
$(
cygpath
-u
$(
cygpath
-m
/
)
/../readme.txt
)
if
[[
-f
$
readme_filepath
/Readme.txt
]]
;
then
if
[[
-f
$
{
_filename
}
]]
;
then
unix2dos
$readme_filepath
/Readme.txt
echo
Changing
$(
cygpath
-w
${
_filename
}
)
as dos format ...
echo
Change readme.txt to dos format
OK.
unix2dos
${
_filename
}
&&
echo
OK.
fi
fi
# Remove cygwin services to be sure these services will be configured
# Remove cygwin services to be sure these services will be configured
# in this cygwin enviroments when there are many cygwin instances
# in this cygwin enviroments when there are many cygwin instances
# installed in this computer.
# installed in this computer.
for
name
in
$(
cygrunsrv
--list
)
;
do
for
name
in
$(
cygrunsrv
--list
)
;
do
echo
Removing cygservice
$name
echo
Removing
$name
service
cygrunsrv
-R
$name
cygrunsrv
-R
$name
||
show_error_exit
echo
OK.
done
done
# Backup slap-runner.html
# Backup slap-runner.html
cp
/etc/slapos/scripts/slap-runner.html
{
,.orig
}
_filename
=
/etc/slapos/scripts/slap-runner.html
if
[[
-r
${
_filename
}
]]
;
then
echo
Backuping
${
_filename
}
as
${
_filename
}
.orig
cp
${
_filename
}
{
,.orig
}
&&
echo
OK.
else
echo
Warning: Missing
${
_filename
}
fi
# Unzip slapos.tar.gz
# Unzip slapos.tar.gz
if
[[
-r
/opt/downloads/slapos.tar.gz
]]
;
then
_filename
=
/opt/downloads/slapos.tar.gz
echo
Extracting slapos.tar.gz
if
[[
-r
${
_filename
}
]]
;
then
cd
/opt
echo
Extracting
${
_filename
}
...
tar
xzf /opt/downloads/slapos.tar.gz
--no-same-owner
||
(
cd
/opt
;
tar
xzf
${
_filename
}
--no-same-owner
)
||
show_error_exit
show_error_exit
"Failed to untar slapos.tar.gz"
echo
OK.
echo
Extracte slapos.tar.gz OK.
elif
[[
!
-d
/opt/slapos
]]
;
then
echo
Warning: Missing
${
_filename
}
fi
fi
echo
Run post-install script successfully.
echo
echo
Run post-install.sh script successfully.
echo
read
-n
1
-t
60
-p
"Press any key to exit..."
read
-n
1
-t
60
-p
"Press any key to exit..."
exit
0
exit
0
windows/scripts/pre-uninstall.sh
View file @
005becea
...
@@ -23,10 +23,10 @@ export PATH=/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin:$PATH
...
@@ -23,10 +23,10 @@ export PATH=/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin:$PATH
for
ifname
in
$(
netsh interface ipv6 show interface | gawk
'{ print $5 }'
)
;
do
for
ifname
in
$(
netsh interface ipv6 show interface | gawk
'{ print $5 }'
)
;
do
if
[[
"
$ifname
"
==
"re6stnet-lo"
]]
;
then
if
[[
"
$ifname
"
==
"re6stnet-lo"
]]
;
then
echo
Removing network connection:
$ifname
echo
Removing network connection:
$ifname
ipwin remove
*
msloop re6stnet-lo
ipwin remove
*
msloop re6stnet-lo
&&
echo
OK.
elif
[[
"
$ifname
"
==
re6stnet
*
]]
;
then
elif
[[
"
$ifname
"
==
re6stnet
*
]]
;
then
echo
Removing network connection:
$ifname
echo
Removing network connection:
$ifname
ipwin remove tap0901
$ifname
ipwin remove tap0901
$ifname
&&
echo
OK.
fi
fi
done
done
...
@@ -34,10 +34,10 @@ done
...
@@ -34,10 +34,10 @@ done
# Remove services installed by cygwin,
# Remove services installed by cygwin,
#
#
echo
Try to
kill
openvpn process ...
echo
Try to
kill
openvpn process ...
ps
-ef
|
grep
-q
"/usr/bin/openvpn"
&&
TASKKILL /IM openvpn.exe /F
ps
-ef
|
grep
-q
"/usr/bin/openvpn"
&&
TASKKILL /IM openvpn.exe /F
&&
echo
OK.
for
name
in
$(
cygrunsrv
--list
)
;
do
for
name
in
$(
cygrunsrv
--list
)
;
do
echo
Removing cygservice
$name
echo
Removing cygservice
$name
cygrunsrv
-R
$name
cygrunsrv
-R
$name
&&
echo
OK.
done
done
#
#
...
@@ -45,33 +45,35 @@ done
...
@@ -45,33 +45,35 @@ done
#
#
for
name
in
$(
net user
)
;
do
for
name
in
$(
net user
)
;
do
if
[[
"x
$name
"
==
x
\*
slapuser
*
]]
;
then
if
[[
"x
$name
"
==
x
\*
slapuser
*
]]
;
then
echo
Remov
e
user:
$name
echo
Remov
ing
user:
$name
net user
$name
/delete
net user
$name
/delete
&&
echo
OK.
elif
echo
"
$name
"
|
grep
-q
-E
"(sshd)|(cyg_server)|(slaproot)"
;
then
elif
echo
"
$name
"
|
grep
-q
-E
"(sshd)|(cyg_server)|(slaproot)"
;
then
echo
Remov
e
user:
$name
echo
Remov
ing
user:
$name
net user
$name
/delete
net user
$name
/delete
&&
echo
OK.
fi
fi
done
done
mkpasswd
-l
>
/etc/passwd
echo
"Creating /etc/passwd ..."
mkpasswd
-l
>
/etc/passwd
&&
echo
OK.
#
#
# Remove local group installed by slapos node
# Remove local group installed by slapos node
#
#
for
name
in
$(
net localgroup |
sed
-n
-e
"s/^*//p"
|
sed
-e
"s/
\\
s//g"
)
;
do
for
name
in
$(
net localgroup |
sed
-n
-e
"s/^*//p"
|
sed
-e
"s/
\\
s//g"
)
;
do
if
[[
"
$name
"
==
grp_slapuser
*
]]
;
then
if
[[
"
$name
"
==
grp_slapuser
*
]]
;
then
echo
Remov
e
localgroup:
$name
echo
Remov
ing
localgroup:
$name
net localgroup
$name
/delete
net localgroup
$name
/delete
&&
echo
OK.
fi
fi
done
done
mkgroup
-l
>
/etc/group
echo
"Creating /etc/group ..."
mkgroup
-l
>
/etc/group
&&
echo
OK.
#
#
# Remove configure files
# Remove configure files
#
#
echo
Removing /etc/opt/slapos
echo
Removing /etc/opt/slapos
rm
-rf
/etc/opt/slapos/
rm
-rf
/etc/opt/slapos/
&&
echo
OK.
echo
Removing ~/.slapos
echo
Removing ~/.slapos
rm
-rf
~/.slapos
rm
-rf
~/.slapos
&&
echo
OK.
#
#
# Remove slapos-configure from windows startup item
# Remove slapos-configure from windows startup item
...
@@ -79,14 +81,16 @@ rm -rf ~/.slapos
...
@@ -79,14 +81,16 @@ rm -rf ~/.slapos
slapos_run_key
=
'\HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run'
slapos_run_key
=
'\HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run'
slapos_run_entry
=
slapos-configure
slapos_run_entry
=
slapos-configure
echo
Removing startup item
"
$slapos_run_key
\\
$slapos_run_entry
"
echo
Removing startup item
"
$slapos_run_key
\\
$slapos_run_entry
"
regtool
-q
unset
"
$slapos_run_key
\\
$slapos_run_entry
"
regtool
-q
unset
"
$slapos_run_key
\\
$slapos_run_entry
"
&&
echo
OK.
#
#
# Remove default instance root, because it belong to slapuser, and
# Remove default instance root, because it belong to slapuser, and
# would be removed by the windows uninstaller.
# would be removed by the windows uninstaller.
#
#
[[
-f
/srv/slapgrid
]]
&&
echo
Removing /srv/slapgrid
&&
rm
-rf
/srv/slapgrid
[[
-f
/srv/slapgrid
]]
&&
echo
Removing /srv/slapgrid
&&
rm
-rf
/srv/slapgrid
&&
echo
OK.
echo
Run pre-uninstall script successfully.
echo
echo
Run pre-uninstall script complete.
echo
read
-n
1
-t
60
-p
"Press any key to exit..."
read
-n
1
-t
60
-p
"Press any key to exit..."
exit
0
exit
0
windows/scripts/slapos-all-in-one.iss
View file @
005becea
...
@@ -72,10 +72,10 @@ Source: "opt\git\slapos.package\windows\docs\README.cygwin"; DestDir: "{app}"; D
...
@@ -72,10 +72,10 @@ Source: "opt\git\slapos.package\windows\docs\README.cygwin"; DestDir: "{app}"; D
[Icons]
[Icons]
Name: "{commondesktop}\SlapOS"; Filename: "https://www.slapos.org/"; IconFilename: "{app}\cygwin\etc\slapos\images\slapos.ico";
Name: "{commondesktop}\SlapOS"; Filename: "https://www.slapos.org/"; IconFilename: "{app}\cygwin\etc\slapos\images\slapos.ico";
Name: "{group}\Command Console"; Filename: "{app}\cygwin\cygtty.bat"; WorkingDir: "{app}\cygwin\opt\slapos"; IconFilename: "{app}\cygwin\etc\slapos\images\terminal.ico";
Name: "{group}\Command Console"; Filename: "{app}\cygwin\cygtty.bat"; WorkingDir: "{app}\cygwin\opt\slapos"; IconFilename: "{app}\cygwin\etc\slapos\images\terminal.ico";
Name: "{group}\Configure SlapOS"; Filename: "{app}\cygwin\bin\mintty.exe"; Parameters: "-c ~/.minttyrc -h
never -t ""Configure SlapOS Node
"" /etc/slapos/scripts/slapos-configure.sh"; WorkingDir: "{app}\cygwin\bin"; IconFilename: "{app}\cygwin\etc\slapos\images\configure.ico";
Name: "{group}\Configure SlapOS"; Filename: "{app}\cygwin\bin\mintty.exe"; Parameters: "-c ~/.minttyrc -h
error -t ""Configure SlapOS
"" /etc/slapos/scripts/slapos-configure.sh"; WorkingDir: "{app}\cygwin\bin"; IconFilename: "{app}\cygwin\etc\slapos\images\configure.ico";
Name: "{group}\SlapOS Runner"; Filename: "{app}\cygwin\etc\slapos\scripts\slap-runner.html"; IconFilename: "{app}\cygwin\etc\slapos\images\manager.ico";
Name: "{group}\SlapOS Runner"; Filename: "{app}\cygwin\etc\slapos\scripts\slap-runner.html"; IconFilename: "{app}\cygwin\etc\slapos\images\manager.ico";
Name: "{group}\SlapOS"; Filename: "https://www.slapos.org/"; IconFilename: "{app}\cygwin\etc\slapos\images\slapos.ico";
Name: "{group}\SlapOS"; Filename: "https://www.slapos.org/"; IconFilename: "{app}\cygwin\etc\slapos\images\slapos.ico";
Name: "{group}\SlapOS Node"; Filename: "{app}\cygwin\bin\
bash.exe"; Parameters: "--login -i
/etc/slapos/scripts/slapos-node.sh"; WorkingDir: "{app}\cygwin\bin"; IconFilename: "{app}\cygwin\etc\slapos\images\node.ico";
Name: "{group}\SlapOS Node"; Filename: "{app}\cygwin\bin\
mintty.exe"; Parameters: "-c ~/.minttyrc -h error -t ""SlapOS Node""
/etc/slapos/scripts/slapos-node.sh"; WorkingDir: "{app}\cygwin\bin"; IconFilename: "{app}\cygwin\etc\slapos\images\node.ico";
Name: "{group}\Uninstall SlapOS"; Filename: "{uninstallexe}";
Name: "{group}\Uninstall SlapOS"; Filename: "{uninstallexe}";
Name: "{group}\User Guide"; Filename: "{app}\user-guide.html";
Name: "{group}\User Guide"; Filename: "{app}\user-guide.html";
...
@@ -85,7 +85,7 @@ Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scrip
...
@@ -85,7 +85,7 @@ Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scrip
Filename: "{app}\cygwin\autorebase.bat"; WorkingDir: "{app}\cygwin"; Flags: skipifdoesntexist runhidden;
Filename: "{app}\cygwin\autorebase.bat"; WorkingDir: "{app}\cygwin"; Flags: skipifdoesntexist runhidden;
[UninstallRun]
[UninstallRun]
Filename: "{app}\cygwin\bin\
bash.exe"; Parameters: "--login -i
/etc/slapos/scripts/pre-uninstall.sh"; WorkingDir: "{app}\cygwin\bin"; Flags: skipifdoesntexist;
Filename: "{app}\cygwin\bin\
mintty.exe"; Parameters: "-c ~/.minttyrc -h never -t ""Uninstall SlapOS""
/etc/slapos/scripts/pre-uninstall.sh"; WorkingDir: "{app}\cygwin\bin"; Flags: skipifdoesntexist;
[UninstallDelete]
[UninstallDelete]
Type: filesandordirs; Name: "{app}\cygwin" ;
Type: filesandordirs; Name: "{app}\cygwin" ;
...
...
windows/scripts/slapos-configure.sh
View file @
005becea
This diff is collapsed.
Click to expand it.
windows/scripts/slapos-include.sh
View file @
005becea
...
@@ -182,7 +182,7 @@ function reset_slapos_connection()
...
@@ -182,7 +182,7 @@ function reset_slapos_connection()
# ======================================================================
# ======================================================================
function
show_error_exit
()
function
show_error_exit
()
{
{
echo
${
1
-Error
:
run Configure Slapos
failed.
}
echo
${
1
-Error
:
configure SlapOS
failed.
}
read
-n
1
-p
"Press any key to exit..."
read
-n
1
-p
"Press any key to exit..."
exit
1
exit
1
}
# === show_error_exit() === #
}
# === show_error_exit() === #
...
@@ -213,8 +213,9 @@ slapos_request_password()
...
@@ -213,8 +213,9 @@ slapos_request_password()
_password
=
"
${
csih_value
}
"
_password
=
"
${
csih_value
}
"
if
[
-z
"
${
_password
}
"
]
if
[
-z
"
${
_password
}
"
]
then
then
csih_error_multi
"Exiting configuration.
I don't know the password of
${
username
}
."
csih_error_multi
"Exiting configuration.
"
"
I don't know the password of
${
username
}
."
fi
fi
csih_PRIVILEGED_PASSWORD
=
"
${
_password
}
"
}
# === slapos_request_password() === #
}
# === slapos_request_password() === #
# ======================================================================
# ======================================================================
...
...
windows/scripts/slapos-node.sh
View file @
005becea
#! /bin/bash
#! /bin/bash
source
$(
/usr/bin/dirname
$0
)
/slapos-include.sh
source
$(
/usr/bin/dirname
$0
)
/slapos-include.sh
echo
echo
"Start slapos-node script ..."
echo
# -----------------------------------------------------------
# -----------------------------------------------------------
# Check all the configure files
# Check all the configure files
...
@@ -43,5 +46,8 @@ echo "Creating instance ..."
...
@@ -43,5 +46,8 @@ echo "Creating instance ..."
echo
"Sending report ..."
echo
"Sending report ..."
/opt/slapos/bin/slapos node report
--verbose
/opt/slapos/bin/slapos node report
--verbose
echo
echo
"Run slapos-node script successfully."
echo
read
-n
1
-t
60
-p
"Press any key to exit..."
read
-n
1
-t
60
-p
"Press any key to exit..."
exit
0
exit
0
windows/scripts/slapos.iss
View file @
005becea
...
@@ -67,10 +67,10 @@ Source: "opt\git\slapos.package\windows\docs\README.cygwin"; DestDir: "{app}"; D
...
@@ -67,10 +67,10 @@ Source: "opt\git\slapos.package\windows\docs\README.cygwin"; DestDir: "{app}"; D
[Icons]
[Icons]
Name: "{commondesktop}\SlapOS"; Filename: "https://www.slapos.org/"; IconFilename: "{app}\cygwin\etc\slapos\images\slapos.ico";
Name: "{commondesktop}\SlapOS"; Filename: "https://www.slapos.org/"; IconFilename: "{app}\cygwin\etc\slapos\images\slapos.ico";
Name: "{group}\Command Console"; Filename: "{app}\cygwin\cygtty.bat"; WorkingDir: "{app}\cygwin\opt\slapos"; IconFilename: "{app}\cygwin\etc\slapos\images\terminal.ico";
Name: "{group}\Command Console"; Filename: "{app}\cygwin\cygtty.bat"; WorkingDir: "{app}\cygwin\opt\slapos"; IconFilename: "{app}\cygwin\etc\slapos\images\terminal.ico";
Name: "{group}\Configure SlapOS"; Filename: "{app}\cygwin\bin\mintty.exe"; Parameters: "-c ~/.minttyrc -h
never -t ""Configure SlapOS Node
"" /etc/slapos/scripts/slapos-configure.sh"; WorkingDir: "{app}\cygwin\bin"; IconFilename: "{app}\cygwin\etc\slapos\images\configure.ico";
Name: "{group}\Configure SlapOS"; Filename: "{app}\cygwin\bin\mintty.exe"; Parameters: "-c ~/.minttyrc -h
error -t ""Configure SlapOS
"" /etc/slapos/scripts/slapos-configure.sh"; WorkingDir: "{app}\cygwin\bin"; IconFilename: "{app}\cygwin\etc\slapos\images\configure.ico";
Name: "{group}\SlapOS Runner"; Filename: "{app}\cygwin\etc\slapos\scripts\slap-runner.html"; IconFilename: "{app}\cygwin\etc\slapos\images\manager.ico";
Name: "{group}\SlapOS Runner"; Filename: "{app}\cygwin\etc\slapos\scripts\slap-runner.html"; IconFilename: "{app}\cygwin\etc\slapos\images\manager.ico";
Name: "{group}\SlapOS"; Filename: "https://www.slapos.org/"; IconFilename: "{app}\cygwin\etc\slapos\images\slapos.ico";
Name: "{group}\SlapOS"; Filename: "https://www.slapos.org/"; IconFilename: "{app}\cygwin\etc\slapos\images\slapos.ico";
Name: "{group}\SlapOS Node"; Filename: "{app}\cygwin\bin\
bash.exe"; Parameters: "--login -i
/etc/slapos/scripts/slapos-node.sh"; WorkingDir: "{app}\cygwin\bin"; IconFilename: "{app}\cygwin\etc\slapos\images\node.ico";
Name: "{group}\SlapOS Node"; Filename: "{app}\cygwin\bin\
mintty.exe"; Parameters: "-c ~/.minttyrc -h error -t ""SlapOS Node""
/etc/slapos/scripts/slapos-node.sh"; WorkingDir: "{app}\cygwin\bin"; IconFilename: "{app}\cygwin\etc\slapos\images\node.ico";
Name: "{group}\Uninstall SlapOS"; Filename: "{uninstallexe}";
Name: "{group}\Uninstall SlapOS"; Filename: "{uninstallexe}";
Name: "{group}\User Guide"; Filename: "{app}\user-guide.html";
Name: "{group}\User Guide"; Filename: "{app}\user-guide.html";
...
@@ -81,7 +81,7 @@ Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scrip
...
@@ -81,7 +81,7 @@ Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scrip
Filename: "{app}\cygwin\autorebase.bat"; WorkingDir: "{app}\cygwin"; Flags: skipifdoesntexist runhidden;
Filename: "{app}\cygwin\autorebase.bat"; WorkingDir: "{app}\cygwin"; Flags: skipifdoesntexist runhidden;
[UninstallRun]
[UninstallRun]
Filename: "{app}\cygwin\bin\
bash.exe"; Parameters: "--login -i
/etc/slapos/scripts/pre-uninstall.sh"; WorkingDir: "{app}\cygwin\bin"; Flags: skipifdoesntexist;
Filename: "{app}\cygwin\bin\
mintty.exe"; Parameters: "-c ~/.minttyrc -h never -t ""Uninstall SlapOS""
/etc/slapos/scripts/pre-uninstall.sh"; WorkingDir: "{app}\cygwin\bin"; Flags: skipifdoesntexist;
[UninstallDelete]
[UninstallDelete]
Type: filesandordirs; Name: "{app}\cygwin" ;
Type: filesandordirs; Name: "{app}\cygwin" ;
...
...
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