steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

factor: Update all repos to point to github.com. 

factorcode.org repo can get behind the github one due to #1862 and low RAM on the new factorcode.org server

Change strategy for calling git fetch to not include the branch name if we are on a detached HEAD
master
Doug Coleman 2020-03-15 12:22:15 -05:00
parent 426d8f09b2
commit 172649f667
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -28,7 +28,7 @@ a boot image stored on factorcode.org.
To check out Factor: To check out Factor:
* `git clone git://factorcode.org/git/factor.git` * `git clone git://github.com/factor/factor.git`
* `cd factor` * `cd factor`
To build the latest complete Factor system from git, either use the To build the latest complete Factor system from git, either use the

22
build.sh
View File

@ -12,7 +12,7 @@ OS=
ARCH= ARCH=
WORD= WORD=
GIT_PROTOCOL=${GIT_PROTOCOL:="git"} GIT_PROTOCOL=${GIT_PROTOCOL:="git"}
GIT_URL=${GIT_URL:=$GIT_PROTOCOL"://factorcode.org/git/factor.git"} GIT_URL=${GIT_URL:=$GIT_PROTOCOL"://github.com/factor/factor.git"}
SCRIPT_ARGS="$*" SCRIPT_ARGS="$*"
REQUIRE_CLANG_VERSION=3.1 REQUIRE_CLANG_VERSION=3.1
@ -467,7 +467,7 @@ invoke_git() {
} }
git_clone() { git_clone() {
$ECHO "Downloading the git repository from factorcode.org..." $ECHO "Downloading the git repository from github.com..."
invoke_git clone $GIT_URL invoke_git clone $GIT_URL
} }
@ -492,11 +492,13 @@ update_script_changed() {
invoke_git diff --stat "$(invoke_git merge-base HEAD FETCH_HEAD)" FETCH_HEAD | grep 'build\.sh' >/dev/null invoke_git diff --stat "$(invoke_git merge-base HEAD FETCH_HEAD)" FETCH_HEAD | grep 'build\.sh' >/dev/null
} }
git_fetch_factorcode() { git_fetch() {
$ECHO "Fetching the git repository from factorcode.org..." $ECHO "Fetching the git repository from github.com..."
branch=$(current_git_branch)
rm -f "$(update_script_name)" rm -f "$(update_script_name)"
invoke_git fetch "$GIT_URL" master $ECHO git fetch "$GIT_URL" "$branch"
invoke_git fetch "$GIT_URL" "$branch"
if update_script_changed; then if update_script_changed; then
$ECHO "Updating and restarting the build.sh script..." $ECHO "Updating and restarting the build.sh script..."
@ -567,7 +569,9 @@ make_clean_factor() {
} }
current_git_branch() { current_git_branch() {
git rev-parse --abbrev-ref HEAD # git rev-parse --abbrev-ref HEAD # outputs HEAD for detached head
# outputs nothing for detached HEAD, which is fine for ``git fetch``
git describe --all --exact-match 2>/dev/null | sed 's=.*/=='
} }
check_url() { check_url() {
@ -624,7 +628,7 @@ update_boot_image() {
$ECHO "Factorcode md5: $factorcode_md5"; $ECHO "Factorcode md5: $factorcode_md5";
$ECHO "Disk md5: $disk_md5"; $ECHO "Disk md5: $disk_md5";
if [[ "$factorcode_md5" == "$disk_md5" ]] ; then if [[ "$factorcode_md5" == "$disk_md5" ]] ; then
$ECHO "Your disk boot image matches the one on factorcode.org." $ECHO "Your disk boot image matches the one on downloads.factorcode.org."
else else
$DELETE $BOOT_IMAGE > /dev/null 2>&1 $DELETE $BOOT_IMAGE > /dev/null 2>&1
get_boot_image get_boot_image
@ -677,7 +681,7 @@ install() {
update() { update() {
get_config_info get_config_info
git_fetch_factorcode git_fetch
backup_factor backup_factor
make_clean_factor make_clean_factor
} }
@ -770,7 +774,7 @@ if [[ -n "$2" ]] ; then
fi fi
if [ "$#" -gt 3 ]; then if [ "$#" -gt 3 ]; then
usage usage
$ECHO "error: too many arguments" $ECHO "error: too many arguments"
exit 1 exit 1
fi fi

4
extra/mason/git/git.factor
View File

@ -16,7 +16,7 @@ IN: mason.git
{ {
"git" "git"
"clone" "clone"
"git://factorcode.org/git/factor.git" "git://github.com/factor/factor.git"
} ; } ;
: git-clone ( -- ) : git-clone ( -- )
@ -28,7 +28,7 @@ IN: mason.git
{ {
"git" "git"
"pull" "pull"
"git://factorcode.org/git/factor.git" "git://github.com/factor/factor.git"
"master" "master"
} ; } ;