File tree Expand file tree Collapse file tree 4 files changed +24
-8
lines changed Expand file tree Collapse file tree 4 files changed +24
-8
lines changed Original file line number Diff line number Diff line change 25
25
source $LIB_OSH /bash-strict.sh
26
26
source $LIB_OSH /task-five.sh
27
27
28
- readonly OILS_VERSION=$( head -n 1 oils-version.txt)
28
+ OILS_VERSION=$( head -n 1 oils-version.txt)
29
+ readonly OILS_VERSION
29
30
export OILS_VERSION # for quick_ref.py
30
31
31
32
THIS_DIR=$( readlink -f $( dirname $0 ) )
@@ -667,7 +668,6 @@ run-code-in-doc() {
667
668
;;
668
669
esac
669
670
670
- set -x
671
671
split-and-render doc/$name .md ' ' $web_url
672
672
673
673
local work_dir=$REPO_ROOT /_tmp/$name
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ extract-clang() {
45
45
# TODO: retire ../oil_DEPS dir in favor of wedge
46
46
mkdir -p $DEPS_DIR
47
47
pushd $DEPS_DIR
48
- time tar -x --xz < ../oil /_cache/clang+llvm-$LLVM_VERSION * .tar.xz
48
+ time tar -x --xz < ../oils /_cache/clang+llvm-$LLVM_VERSION * .tar.xz
49
49
popd
50
50
}
51
51
Original file line number Diff line number Diff line change @@ -676,6 +676,11 @@ git-changelog-0.34.0() {
676
676
> _release/VERSION/changelog.html
677
677
}
678
678
679
+ git-changelog-0.35.0 () {
680
+ _git-changelog origin/release/0.34.0 release/0.35.0 \
681
+ > _release/VERSION/changelog.html
682
+ }
683
+
679
684
# For announcement.html
680
685
html-redirect () {
681
686
local url=$1
@@ -1140,6 +1145,10 @@ announcement-0.34.0() {
1140
1145
write-no-announcement
1141
1146
}
1142
1147
1148
+ announcement-0.35.0 () {
1149
+ write-no-announcement
1150
+ }
1151
+
1143
1152
blog-redirect () {
1144
1153
html-redirect ' making-plans.html' > $SITE_DEPLOY_DIR /blog/2020/01/11.html
1145
1154
}
Original file line number Diff line number Diff line change 70
70
source $LIB_OSH /bash-strict.sh
71
71
source $LIB_OSH /task-five.sh
72
72
73
- # readonly ROOTFS_URL='http://dl-cdn.alpinelinux.org/alpine/v3.11/releases/x86_64/alpine-minirootfs-3.11.3-x86_64.tar.gz'
74
- readonly ROOTFS_URL=' https://dl-cdn.alpinelinux.org/alpine/v3.22/releases/x86_64/alpine-minirootfs-3.22.1-x86_64.tar.gz'
73
+ readonly ROOTFS_URL=' http://dl-cdn.alpinelinux.org/alpine/v3.11/releases/x86_64/alpine-minirootfs-3.11.3-x86_64.tar.gz'
74
+ # readonly ROOTFS_URL='https://dl-cdn.alpinelinux.org/alpine/v3.22/releases/x86_64/alpine-minirootfs-3.22.1-x86_64.tar.gz'
75
75
76
76
readonly CHROOT_OILS_TAR=_chroot/alpine-oils-tar
77
77
readonly CHROOT_OILS_SPEC=_chroot/alpine-oils-spec
@@ -92,9 +92,16 @@ _extract() {
92
92
93
93
du --si -s $dest
94
94
}
95
- extract-oils-tar () { sudo $0 _extract $CHROOT_OILS_TAR ; }
96
- extract-oils-spec () { sudo $0 _extract $CHROOT_OILS_SPEC ; }
97
- extract-distro-build () { sudo $0 _extract $CHROOT_DISTRO_BUILD ; }
95
+
96
+ extract-oils-tar () {
97
+ mkdir -p _chroot # should not be owned by root
98
+ sudo $0 _extract $CHROOT_OILS_TAR
99
+ }
100
+
101
+ extract-oils-spec () {
102
+ mkdir -p _chroot # should not be owned by root
103
+ sudo $0 _extract $CHROOT_OILS_SPEC ;
104
+ }
98
105
99
106
# Without this, you can't 'su myusername'. It won't be able to execute bash.
100
107
chmod-chroot () {
You can’t perform that action at this time.
0 commit comments