Commit 14235704 authored by Jondy Zhao's avatar Jondy Zhao

Change items' name in the SlapOS program group

Apply patch before create instance on configure slapos node
parent 98304e6c
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
<itemizedlist> <itemizedlist>
<listitem><para>Configure SlapOS</para></listitem> <listitem><para>Configure SlapOS</para></listitem>
<listitem><para>SlapOS Node</para></listitem> <listitem><para>SlapOS Node</para></listitem>
<listitem><para>SlapOS Desktop</para></listitem> <listitem><para>SlapOS</para></listitem>
<listitem><para>Node Runner</para></listitem> <listitem><para>SlapOS Runner</para></listitem>
<listitem><para>Command Console</para></listitem> <listitem><para>Command Console</para></listitem>
<listitem><para>User Guide</para></listitem> <listitem><para>User Guide</para></listitem>
</itemizedlist> </itemizedlist>
...@@ -84,12 +84,12 @@ Be sure the configure scrip report successfully, otherwise fix the problem and r ...@@ -84,12 +84,12 @@ Be sure the configure scrip report successfully, otherwise fix the problem and r
<para>Be sure the scrip reports successfully, otherwise fix the problem and run it again.</para> <para>Be sure the scrip reports successfully, otherwise fix the problem and run it again.</para>
</section> </section>
<section><title>SlapOS Desktop</title> <section><title>SlapOS</title>
<para>This is used by slapos client, now it's connected to <ulink url="https://www.slapos.org"/>. Logon and enjoy the journey in the SlapOS Cloud world.</para> <para>This is used by slapos client, now it's connected to <ulink url="https://www.slapos.org"/>. Logon and enjoy the journey in the SlapOS Cloud world.</para>
</section> </section>
<section><title>Node Runner</title> <section><title>SlapOS Runner</title>
<para>Node Runner is a web based development tool which uses slapgrid to install and instantiate the software, and it could be used to manage your slapos slave node in your computer.</para> <para>SlapOS Runner is a web based development tool which uses slapgrid to install and instantiate the software, and it could be used to manage your slapos slave node in your computer.</para>
<para>After installing slapos, Node Runner isn't available. You need run Configure SlapOS first. After that, Node Runner would be available.</para> <para>After installing slapos, Node Runner isn't available. You need run Configure SlapOS first. After that, Node Runner would be available.</para>
<para>Refer to <ulink url="http://community.slapos.org/wiki/osoe-Lecture.SlapOS.Extended/developer-Howto.Use.SlapOS.Web.Runner.html5"/></para> <para>Refer to <ulink url="http://community.slapos.org/wiki/osoe-Lecture.SlapOS.Extended/developer-Howto.Use.SlapOS.Web.Runner.html5"/></para>
</section> </section>
......
...@@ -99,6 +99,9 @@ for x in $(cygrunsrv --list) ; do ...@@ -99,6 +99,9 @@ for x in $(cygrunsrv --list) ; do
cygrunsrv -R $x cygrunsrv -R $x
done done
# Backup slap-runner.html
cp /etc/slapos/scripts/slap-runner.html{,.orig}
echo Run post-install script successfully. echo Run post-install script successfully.
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
......
...@@ -71,11 +71,11 @@ Source: "opt\git\slapos.package\windows\docs\using-slapos-in-windows.html"; Dest ...@@ -71,11 +71,11 @@ Source: "opt\git\slapos.package\windows\docs\using-slapos-in-windows.html"; Dest
Source: "opt\git\slapos.package\windows\docs\README.cygwin"; DestDir: "{app}"; DestName: "readme.txt"; Source: "opt\git\slapos.package\windows\docs\README.cygwin"; DestDir: "{app}"; DestName: "readme.txt";
[Icons] [Icons]
Name: "{commondesktop}\SlapOS Desktop"; 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 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}\Node 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 Desktop"; 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\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}\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";
......
...@@ -513,8 +513,17 @@ if (( $? )) ; then ...@@ -513,8 +513,17 @@ if (( $? )) ; then
echo "Supply $slaprunner_cfg in the computer $computer_id" echo "Supply $slaprunner_cfg in the computer $computer_id"
/opt/slapos/bin/slapos supply $slaprunner_cfg $computer_id /opt/slapos/bin/slapos supply $slaprunner_cfg $computer_id
echo "Request an instance $slaprunner_title ..." echo "Request an instance $slaprunner_title ..."
patch_file=/etc/slapos/patches/slapos-cookbook-inotifyx.patch
while true ; do while true ; do
/opt/slapos/bin/slapos node software --verbose /opt/slapos/bin/slapos node software --verbose
# Apply patches to slapos.cookbook for inotifix
if [[ -f $patch_file ]] ; then
for x in $(find /opt/slapgrid/ -name slapos.cookbook-*.egg) ; do
echo Apply patch $patch_file at $x
cd $x
patch -f --dry-run -p1 < $patch_file > /dev/null && patch -p1 < $patch_file
done
fi
/opt/slapos/bin/slapos node instance --verbose /opt/slapos/bin/slapos node instance --verbose
/opt/slapos/bin/slapos node report --verbose /opt/slapos/bin/slapos node report --verbose
/opt/slapos/bin/slapos request $client_config_file $slaprunner_title $slaprunner_cfg --node computer_guid=$computer_id && break /opt/slapos/bin/slapos request $client_config_file $slaprunner_title $slaprunner_cfg --node computer_guid=$computer_id && break
...@@ -531,7 +540,6 @@ if (( $? )) ; then ...@@ -531,7 +540,6 @@ if (( $? )) ; then
echo Got node runner url: $slaprunner_url echo Got node runner url: $slaprunner_url
[[ -z $slaprunner_url ]] && show_error_exit "Failed to create instance of SlapOS Web Runner." [[ -z $slaprunner_url ]] && show_error_exit "Failed to create instance of SlapOS Web Runner."
cp $slapos_runner_file{.html, .html.orig}
cat <<EOF > $slapos_runner_file cat <<EOF > $slapos_runner_file
<html> <html>
<head><title>SlapOS Web Runner</title> <head><title>SlapOS Web Runner</title>
...@@ -548,16 +556,6 @@ function openwin() { ...@@ -548,16 +556,6 @@ function openwin() {
EOF EOF
echo Generate file: $slapos_runner_file echo Generate file: $slapos_runner_file
# Apply patches to slapos.cookbook for inotifix
patch_file=/etc/slapos/patches/slapos-cookbook-inotifyx.patch
if [[ -f $patch_file ]] ; then
echo "Apply patch: $patch_file"
for x in $(find /opt/slapgrid/ -name slapos.cookbook-*.egg) ; do
echo Apply to $x
cd $x
patch -f --dry-run -p1 < $patch_file > /dev/null && patch -p1 < $patch_file
done
fi
echo echo
echo Install Web Runner OK. echo Install Web Runner OK.
echo echo
......
...@@ -65,11 +65,11 @@ Source: "opt\git\slapos.package\windows\docs\using-slapos-in-windows.html"; Dest ...@@ -65,11 +65,11 @@ Source: "opt\git\slapos.package\windows\docs\using-slapos-in-windows.html"; Dest
Source: "opt\git\slapos.package\windows\docs\README.cygwin"; DestDir: "{app}"; DestName: "readme.txt"; Source: "opt\git\slapos.package\windows\docs\README.cygwin"; DestDir: "{app}"; DestName: "readme.txt";
[Icons] [Icons]
Name: "{commondesktop}\SlapOS Desktop"; 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 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}\Node 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 Desktop"; 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\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}\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";
......
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