Skip to content

Commit 882153b

Browse files
committed
rootdevice: remove version
The version is now based on latest dev Signed-off-by: Ansuel Smith <[email protected]>
1 parent bba6d49 commit 882153b

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

decompressed/base/etc/init.d/rootdevice

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ EXTRA_HELP="\
3131
debug force command with debug log
3232
install This root the device for the initial installation
3333
"
34-
35-
version_gui=8.9.90
34+
#Gui version is now autocompleted base on latest dev, this variable will be replaced by the automatic script
35+
version_gui=TO_AUTO_COMPLETE
3636

3737
logo_project() {
3838
cat << EOF > /dev/console

inizialize_gui.sh

+18-19
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if [ $CI == "true" ]; then
2929
echo "Detected version: "$version
3030
echo "New version to apply: "$new_version
3131
32-
sed -i s#version_gui=$version#version_gui=$new_version# $rootdevice_file
32+
sed -i s#version_gui=TO_AUTO_COMPLETE#version_gui=$new_version# $rootdevice_file
3333
fi
3434
3535
@@ -129,23 +129,6 @@ done
129129
cd total && BZIP2=-9 tar -cjf ../compressed/GUI$type.tar.bz2 * --owner=0 --group=0
130130
cd ../
131131
132-
md5sum=$(md5sum compressed/GUI$type.tar.bz2 | awk '{print $1}')
133-
version=$(cat total/etc/init.d/rootdevice | grep -m1 version_gui | cut -d'=' -f 2)
134-
version_file=$(cat compressed/version)
135-
if ! grep -w -q "$version" compressed/version ; then
136-
echo "Adding md5sum of new GUI to version file"
137-
echo "Version: "$version" Md5sum: "$md5sum
138-
echo $md5sum $version >> compressed/version
139-
else
140-
echo "Md5sum already present. Overwriting..."
141-
old_version_md5=$(grep -w "$version" compressed/version | awk '{print $1}')
142-
sed -i "/$version/d" compressed/version
143-
echo "Adding md5sum of new GUI to version file"
144-
echo "Version: "$version" Old_Md5sum: "$old_version_md5
145-
echo "Version: "$version" Md5sum: "$md5sum
146-
echo $md5sum $version >> compressed/version
147-
fi
148-
149132
if [ $CI == "true" ]; then
150133
151134
git config --global user.name "CircleCI";
@@ -155,8 +138,24 @@ if [ $CI == "true" ]; then
155138
156139
echo "Publishing dev build to auto repo...";
157140
git clone [email protected]:Ansuel/gui-dev-build-auto.git $HOME/gui-dev-build-auto/
141+
142+
md5sum=$(md5sum compressed/GUI$type.tar.bz2 | awk '{print $1}')
143+
version=$(cat total/etc/init.d/rootdevice | grep -m1 version_gui | cut -d'=' -f 2)
144+
version_file=$(cat compressed/version)
145+
if ! grep -w -q "$version" $HOME/gui-dev-build-auto/version ; then
146+
echo "Adding md5sum of new GUI to version file"
147+
echo "Version: "$version" Md5sum: "$md5sum
148+
echo $md5sum $version >> $HOME/gui-dev-build-auto/version
149+
else
150+
echo "Md5sum already present. Overwriting..."
151+
old_version_md5=$(grep -w "$version" $HOME/gui-dev-build-auto/version | awk '{print $1}')
152+
sed -i "/$version/d" compressed/version
153+
echo "Adding md5sum of new GUI to version file"
154+
echo "Version: "$version" Old_Md5sum: "$old_version_md5
155+
echo "Version: "$version" Md5sum: "$md5sum
156+
echo $md5sum $version >> $HOME/gui-dev-build-auto/version
157+
fi
158158
159-
cp compressed/version $HOME/gui-dev-build-auto/ -r;
160159
cp compressed/GUI$type.tar.bz2 $HOME/gui-dev-build-auto/ -r;
161160
162161
cd $HOME/gui-dev-build-auto/;

0 commit comments

Comments
 (0)