Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Léo-Paul Géneau
slapos
Commits
2561132f
Commit
2561132f
authored
Jul 25, 2016
by
iv
Committed by
Tomáš Peterka
Aug 04, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NayuOS: fix test after bashrc changes.
parent
26898034
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
software/nayuos/scripts/test_nayuos_image
software/nayuos/scripts/test_nayuos_image
+4
-4
No files found.
software/nayuos/scripts/test_nayuos_image
View file @
2561132f
...
@@ -15,7 +15,7 @@ GRANDENET_SCRIPT="usr/local/bin/grandenet"
...
@@ -15,7 +15,7 @@ GRANDENET_SCRIPT="usr/local/bin/grandenet"
INIT_SSH_SERVER
=
"etc/init/openssh-server.conf"
INIT_SSH_SERVER
=
"etc/init/openssh-server.conf"
BASHRC
=
"etc/skel/.bashrc"
BASHRC
=
"etc/skel/.bashrc"
GIT_CORE
=
"usr/local/libexec/git-core/"
GIT_CORE
=
"usr/local/libexec/git-core/"
EXPECTED_ALIAS
=
"alias git='git --exec-path=/usr/local/libexec/git-core/'
"
GIT_EXPECTED_EXPORT
=
"export GIT_EXEC_PATH=/usr/local/libexec/git-core
"
VIRTUALENV_BIN
=
"usr/local/bin/virtualenv"
VIRTUALENV_BIN
=
"usr/local/bin/virtualenv"
CHROMIUM_POLICY
=
"etc/chromium/policies/recommended/nayuos_policy.json"
CHROMIUM_POLICY
=
"etc/chromium/policies/recommended/nayuos_policy.json"
...
@@ -41,7 +41,7 @@ if [[ $(ls "${MOUNTPOINT}/usr/local") ]] ; then
...
@@ -41,7 +41,7 @@ if [[ $(ls "${MOUNTPOINT}/usr/local") ]] ; then
my_diff
=
$(
diff
"
${
ORIGINAL_GRANDENET_SCRIPT
}
"
"
${
MOUNTPOINT
}
/
${
GRANDENET_SCRIPT
}
"
)
my_diff
=
$(
diff
"
${
ORIGINAL_GRANDENET_SCRIPT
}
"
"
${
MOUNTPOINT
}
/
${
GRANDENET_SCRIPT
}
"
)
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
gitcore
=
$(
ls
"
${
MOUNTPOINT
}
/
${
GIT_CORE
}
"
)
gitcore
=
$(
ls
"
${
MOUNTPOINT
}
/
${
GIT_CORE
}
"
)
git
alias
=
$(
grep
"
${
EXPECTED_ALIAS
}
"
"
${
MOUNTPOINT
}
/
${
BASHRC
}
"
)
git
export
=
$(
grep
"
${
GIT_EXPECTED_EXPORT
}
"
"
${
MOUNTPOINT
}
/
${
BASHRC
}
"
)
virtualenvbin
=
$(
ls
"
${
MOUNTPOINT
}
/
${
VIRTUALENV_BIN
}
"
)
virtualenvbin
=
$(
ls
"
${
MOUNTPOINT
}
/
${
VIRTUALENV_BIN
}
"
)
chromium_policy
=
$(
ls
"
${
MOUNTPOINT
}
/
${
CHROMIUM_POLICY
}
"
)
chromium_policy
=
$(
ls
"
${
MOUNTPOINT
}
/
${
CHROMIUM_POLICY
}
"
)
...
@@ -86,8 +86,8 @@ else
...
@@ -86,8 +86,8 @@ else
echo
"* test bashrc changes for git paths quick fix"
echo
"* test bashrc changes for git paths quick fix"
if
[[
"
${
git
alias
}
"
==
""
]]
;
then
if
[[
"
${
git
export
}
"
==
""
]]
;
then
print_result
${
FAILURE
}
"Expected alias for git command not in
${
MOUNTPOINT
}
/
${
BASHRC
}
. There should be:
${
EXPECTED_ALIAS
}
"
print_result
${
FAILURE
}
"Expected alias for git command not in
${
MOUNTPOINT
}
/
${
BASHRC
}
. There should be:
${
GIT_EXPECTED_EXPORT
}
"
else
else
print_result
${
SUCCESS
}
"git alias is correct."
print_result
${
SUCCESS
}
"git alias is correct."
fi
fi
...
...
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