mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
fix(settings): dont rely on Qt.btoa to generate default settings dump.
This commit is contained in:
@@ -560,4 +560,4 @@
|
||||
"gridSnapScale": false,
|
||||
"monitorWidgets": []
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -292,4 +292,4 @@
|
||||
"colorName": "primary"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1068,9 +1068,7 @@ Singleton {
|
||||
|
||||
var defaultPath = Quickshell.shellDir + "/Assets/settings-default.json";
|
||||
|
||||
// Encode transfer it has base64 to avoid any escaping issue
|
||||
var base64Data = Qt.btoa(jsonData);
|
||||
Quickshell.execDetached(["sh", "-c", `echo "${base64Data}" | base64 -d > "${defaultPath}"`]);
|
||||
Quickshell.execDetached(["sh", "-c", `cat > "${defaultPath}" << 'NOCTALIA_EOF'\n${jsonData}\nNOCTALIA_EOF`]);
|
||||
} catch (error) {
|
||||
Logger.e("Settings", "Failed to generate default settings file: " + error);
|
||||
}
|
||||
@@ -1091,8 +1089,7 @@ Singleton {
|
||||
|
||||
var defaultPath = Quickshell.shellDir + "/Assets/settings-widgets-default.json";
|
||||
|
||||
var base64Data = Qt.btoa(jsonData);
|
||||
Quickshell.execDetached(["sh", "-c", `echo "${base64Data}" | base64 -d > "${defaultPath}"`]);
|
||||
Quickshell.execDetached(["sh", "-c", `cat > "${defaultPath}" << 'NOCTALIA_EOF'\n${jsonData}\nNOCTALIA_EOF`]);
|
||||
} catch (error) {
|
||||
Logger.e("Settings", "Failed to generate widget default settings file: " + error);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user