Skip to content

Commit d172dfc

Browse files
committed
Uses version as lib path
1 parent a36101c commit d172dfc

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

install_helper.sh

+14-17
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ get_releases() {
77
}
88

99
linux_install() {
10-
bin_path=$HOME/.local/share/code-server/bin
11-
lib_path=$HOME/.local/share/code-server/lib
12-
1310
releases=$(get_releases)
1411
package=$(echo "$releases" | grep 'linux' | grep 'x86' | sed -E 's/.*"([^"]+)".*/\1/')
1512
version=$(echo $releases | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
1613

14+
bin_dir=$HOME/.local/share/code-server/bin
15+
bin_path=$bin_dir/code-server
16+
lib_path=$HOME/.local/share/code-server/$version
17+
1718
temp_path=/tmp/code-server-$version
1819

1920
if [ -d $temp_path ]; then
@@ -30,32 +31,28 @@ linux_install() {
3031
tar -xzf code-server*.tar.gz > /dev/null
3132
rm code-server*.tar.gz
3233

33-
if [ -d $lib_path/code-server ]; then
34-
backup=$lib_path/BACKUP_$(date +%s)_code-server/
35-
mv -f $lib_path/code-server/ $backup
34+
if [ -d $lib_path ]; then
35+
backup=$(dirname $lib_path)/BACKUP_$(date +%s)/
36+
mv -f $lib_path/ $backup
3637
echo "-- INFO: old code-server directory moved to $backup"
3738
fi
3839

39-
mkdir -p $lib_path/code-server
40-
41-
mv -f code-server*/* $lib_path/code-server/
40+
mkdir -p $lib_path
4241

43-
if [ -d $bin_path/code-server ]; then
44-
rm $bin_path/code-server
45-
fi
42+
mv -f code-server*/* $lib_path/
4643

47-
mkdir -p $bin_path
48-
ln -f -s $lib_path/code-server/code-server $bin_path/code-server
44+
mkdir -p $bin_dir
45+
ln -f -s $lib_path/code-server $bin_path
4946

5047
rm -rf -f $temp_path
5148

52-
if [ $bin_path != *"$PATH"* ]; then
49+
if [ $bin_dir != *"$PATH"* ]; then
5350
RED='\033[0;31m'
5451
NC='\033[0m' # No Color
55-
echo -e "${RED}-- WARNING: $bin_path is not in your \$PATH${NC}"
52+
echo -e "${RED}-- WARNING: $bin_dir is not in your \$PATH${NC}"
5653
fi
5754

58-
echo "-- Successfully installed code-server at $bin_path/code-server"
55+
echo "-- Successfully installed code-server at $bin_path"
5956
}
6057

6158
mac_install() {

0 commit comments

Comments
 (0)