timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-24 11:50:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Vicente Reyes
2019-06-11 17:31:48 -04:00
parent f1233fc9b8 db1afbd17a
commit 1c13ffb556
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@@ -22,7 +22,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
nameShort='setpath(["nameShort"]; "VSCodium")'
nameLong='setpath(["nameLong"]; "VSCodium")'
linuxIconName='setpath(["linuxIconName"]; "vscodium")'
applicationName='setpath(["applicationName"]; "vscodium")'
applicationName='setpath(["applicationName"]; "codium")'
win32MutexName='setpath(["win32MutexName"]; "vscodium")'
win32DirName='setpath(["win32DirName"]; "VSCodium")'
win32NameVersion='setpath(["win32NameVersion"]; "VSCodium")'
@@ -45,7 +45,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
# unless the app name is code-oss
# as we are renaming the application to vscodium
# we need to edit a line in the post install template
sed -i "s/code-oss/vscodium/" resources/linux/debian/postinst.template
sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
fi
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then