good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
4cd9d57b
Commit
4cd9d57b
authored
10 years ago
by
Jeffrey Wilcke
Browse files
Options
Downloads
Plain Diff
Merge pull request #187 from honestmoney/develop
Fix for broken develop build and install.sh
parents
cad770c7
28b7dcc2
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmd/ethereum/main.go
+1
-1
1 addition, 1 deletion
cmd/ethereum/main.go
install.sh
+22
-19
22 additions, 19 deletions
install.sh
with
23 additions
and
20 deletions
cmd/ethereum/main.go
+
1
−
1
View file @
4cd9d57b
...
...
@@ -93,7 +93,7 @@ func main() {
os
.
Exit
(
1
)
}
fmt
.
Printf
(
"RLP: %x
\n
state: %x
\n
hash: %x
\n
"
,
ethutil
.
Rlp
(
block
),
block
.
Get
Root
(),
block
.
Hash
())
fmt
.
Printf
(
"RLP: %x
\n
state: %x
\n
hash: %x
\n
"
,
ethutil
.
Rlp
(
block
),
block
.
Root
(),
block
.
Hash
())
// Leave the Println. This needs clean output for piping
fmt
.
Printf
(
"%s
\n
"
,
block
.
State
()
.
Dump
())
...
...
This diff is collapsed.
Click to expand it.
install.sh
+
22
−
19
View file @
4cd9d57b
#!/bin/sh
if
[
"
$1
"
==
""
]
;
then
echo
"Usage
$0
executable branch
ethereum develop
"
echo
"executable ethereum
or
mist"
echo
"branch develop
or
master"
echo
"Usage
$0
executable branch"
echo
"executable ethereum
|
mist"
echo
"branch develop
|
master"
exit
fi
exe
=
$1
path
=
$exe
branch
=
$2
if
[
"
$branch
"
==
"develop"
]
;
then
path
=
"cmd/
$exe
"
fi
# Test if go is installed
command
-v
go
>
/dev/null 2>&1
||
{
echo
>
&2
"Unable to find 'go'. This script requires go."
;
exit
1
;
}
...
...
@@ -19,20 +24,23 @@ if [ "$GOPATH" == "" ]; then
exit
fi
echo
"go get -u -d github.com/ethereum/go-ethereum/
$exe
"
go get
-v
-u
-d
github.com/ethereum/go-ethereum/
$exe
if
[
$?
!=
0
]
;
then
echo
"go get failed"
exit
fi
echo
"eth-go"
echo
"changing branch to
$branch
"
cd
$GOPATH
/src/github.com/ethereum/go-ethereum
git checkout
$branch
echo
"go-ethereum"
cd
$GOPATH
/src/github.com/ethereum/go-ethereum/
$exe
git checkout
$branch
# installing package dependencies doesn't work for develop
# branch as go get always pulls from master head
# so build will continue to fail, but this installs locally
# for people who git clone since go install will manage deps
#echo "go get -u -d github.com/ethereum/go-ethereum/$path"
#go get -v -u -d github.com/ethereum/go-ethereum/$path
#if [ $? != 0 ]; then
# echo "go get failed"
# exit
#fi
cd
$GOPATH
/src/github.com/ethereum/go-ethereum/
$path
if
[
"
$exe
"
==
"mist"
]
;
then
echo
"Building Mist GUI. Assuming Qt is installed. If this step"
...
...
@@ -42,9 +50,4 @@ else
fi
go
install
if
[
$?
==
0
]
;
then
echo
"go install failed"
exit
fi
echo
"done. Please run
$exe
:-)"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment