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
Guillaume Hervier
slapos.package
Commits
1164037e
Commit
1164037e
authored
Jul 01, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't apply patch if the source has been patched.
parent
3078b5fd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
windows/scripts/build-slapos.sh
windows/scripts/build-slapos.sh
+1
-1
windows/scripts/slapos-configure.sh
windows/scripts/slapos-configure.sh
+2
-3
No files found.
windows/scripts/build-slapos.sh
View file @
1164037e
...
@@ -43,7 +43,7 @@ if [[ -f $patch_file ]] ; then
...
@@ -43,7 +43,7 @@ if [[ -f $patch_file ]] ; then
for
x
in
$(
find
$slapos_home
/eggs
-name
slapos.core-
*
.egg
;
do
for
x
in
$(
find
$slapos_home
/eggs
-name
slapos.core-
*
.egg
;
do
echo
Patching
$x
...
echo
Patching
$x
...
cd
$x
cd
$x
patch
-
-dry-run
-p1
<
$patch_file
&&
patch
-p1
<
$patch_file
&&
echo
Patch
$x
OK.
patch
-
f
--dry-run
-p1
<
$patch_file
>
/dev/null
&&
patch
-p1
<
$patch_file
&&
echo
Patch
$x
OK.
done
done
fi
fi
...
...
windows/scripts/slapos-configure.sh
View file @
1164037e
...
@@ -468,7 +468,6 @@ done
...
@@ -468,7 +468,6 @@ done
#-------------------------------------------------
#-------------------------------------------------
slaprunner_title
=
"SlapOS-Node-Runner-In-
$computer_id
"
slaprunner_title
=
"SlapOS-Node-Runner-In-
$computer_id
"
grep
-q
"window.location.href"
$slapos_runner_file
grep
-q
"window.location.href"
$slapos_runner_file
if
((
$?
))
;
then
if
((
$?
))
;
then
echo
echo
...
@@ -487,7 +486,7 @@ if (( $? )) ; then
...
@@ -487,7 +486,7 @@ 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
'Node Runner'
..."
echo
"Request an instance
$slaprunner_title
..."
while
true
;
do
while
true
;
do
/opt/slapos/bin/slapos node software
--verbose
/opt/slapos/bin/slapos node software
--verbose
/opt/slapos/bin/slapos node instance
--verbose
/opt/slapos/bin/slapos node instance
--verbose
...
@@ -530,7 +529,7 @@ EOF
...
@@ -530,7 +529,7 @@ EOF
for
x
in
$(
find /opt/slapgrid/
-name
slapos.cookbook-
*
.egg
)
;
do
for
x
in
$(
find /opt/slapgrid/
-name
slapos.cookbook-
*
.egg
)
;
do
echo
Apply to
$x
echo
Apply to
$x
cd
$x
cd
$x
patch
-
-dry-run
-p1
<
$patch_file
&&
patch
-p1
<
$patch_file
patch
-
f
--dry-run
-p1
<
$patch_file
>
/dev/null
&&
patch
-p1
<
$patch_file
done
done
fi
fi
echo
echo
...
...
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